diff --git a/data/manifest.yaml b/data/manifest.yaml
index 91746f9f..23b8fbc3 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -53917,22 +53917,6 @@ Batla:
   steam:
     id: 200260
 "Batman: Arkham Knight":
-  files:
-    "<base>/BMGame/Config":
-      tags:
-        - config
-      when:
-        - os: windows
-    "<base>/BMGame/SaveData":
-      tags:
-        - save
-      when:
-        - os: windows
-    "<root>/userdata/<storeUserId>/208650":
-      tags:
-        - save
-      when:
-        - store: steam
   gog:
     id: 1881970704
   id:
@@ -138985,6 +138969,15 @@ Deadlands Noir - That Old Time Religion:
   steam:
     id: 383670
 "Deadliest Catch: The Game":
+  files:
+    "<home>/AppData/LocalLow/Moonlit/DeadliestCatch/{64BitSteamID}/Headers/*.hdc":
+      when:
+        - os: windows
+          store: steam
+    "<home>/AppData/LocalLow/Moonlit/DeadliestCatch/{64BitSteamID}/Saves/*.ddc":
+      when:
+        - os: windows
+          store: steam
   installDir:
     Deadliest Catch The Game: {}
   launch:
@@ -327473,6 +327466,11 @@ MU Legend:
   steam:
     id: 874240
 MUD Motocross World Championship:
+  files:
+    "<winAppData>/Milestone/MUD":
+      when:
+        - os: windows
+          store: steam
   installDir:
     MUD Motocross World Championship: {}
   launch:
@@ -361645,6 +361643,10 @@ My Friend Pedro:
   steam:
     id: 557340
 My Friend Peppa Pig:
+  files:
+    "<home>/AppData/LocalLow/Outright Games/My Friend Peppa Pig/SaveData/CodenamePeppa/{64BitSteamID}/**/*.game.binary":
+      when:
+        - store: steam
   installDir:
     My Friend Peppa Pig: {}
   launch:
@@ -364895,6 +364897,10 @@ NASCAR Heat 3:
         - save
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 934130
+      - 934131
   installDir:
     NASCAR Heat 3: {}
   launch:
@@ -364973,6 +364979,18 @@ NASCAR Heat Evolution:
         - save
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 524630
+      - 525180
+      - 525181
+      - 525182
+      - 525183
+      - 525184
+      - 525185
+      - 525186
+      - 525187
+      - 525188
   installDir:
     NASCAR Heat Evolution: {}
   launch:
@@ -424825,8 +424843,12 @@ Pumped BMX +:
     "<home>/AppData/LocalLow/Yeah Us_/Pumped BMX _/PlayerPrefs.txt":
       tags:
         - config
+        - save
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 403140
   installDir:
     Pumped BMX +: {}
   launch:
@@ -540346,6 +540368,9 @@ Taken:
 "Taken Souls: Blood Ritual Collector's Edition":
   alias: "Taken Souls: Blood Ritual"
 Takenoko:
+  id:
+    steamExtra:
+      - 1028400
   installDir:
     Takenoko: {}
   launch:
@@ -629244,13 +629269,21 @@ War Mongrels:
         - save
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 1788010
   installDir:
     War Mongrels: {}
   launch:
     "<base>/WM/Binaries/Win64/WM-Win64-Shipping.exe":
-      - arguments: "-EnableCrashReports -DCPlatform=SteamFull"
+      - arguments: "-EnableCrashReports -DCPlatform=SteamFull -DCGatherPlayerProfile -DCGatherSavegame"
         when:
-          - store: steam
+          - os: windows
+            store: steam
+    "<base>/War Mongrels.app":
+      - when:
+          - os: mac
+            store: steam
   steam:
     id: 1101790
 War Of Being:
@@ -637666,8 +637699,21 @@ What the Golf?:
         - save
       when:
         - os: windows
+    "<home>/Library/Application Support/com.thelabelgames.golfmac/GolfSave.golf":
+      tags:
+        - save
+      when:
+        - os: mac
+    "<home>/Library/Preferences/com.thelabelgames.golfmac.plist":
+      tags:
+        - config
+      when:
+        - os: mac
   gog:
     id: 1379120886
+  id:
+    gogExtra:
+      - 1894642988
   installDir:
     WHAT THE GOLF: {}
   launch:
diff --git a/data/missing.md b/data/missing.md
index acf348f1..5680642d 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -3002,6 +3002,7 @@
 * [Batman Forever](https://www.pcgamingwiki.com/wiki/?curid=176717)
 * [Batman Forever: The Arcade Game](https://www.pcgamingwiki.com/wiki/?curid=176719)
 * [Batman Returns](https://www.pcgamingwiki.com/wiki/?curid=176691)
+* [Batman: Arkham Knight](https://www.pcgamingwiki.com/wiki/?curid=15767)
 * [BatMUD](https://www.pcgamingwiki.com/wiki/?curid=153141)
 * [Bato: Treasures of Tibet](https://www.pcgamingwiki.com/wiki/?curid=155454)
 * [BATS: Bloodsucker Anti-Terror Squad](https://www.pcgamingwiki.com/wiki/?curid=184510)
@@ -7831,7 +7832,6 @@
 * [DEADHUNTERS](https://www.pcgamingwiki.com/wiki/?curid=113080)
 * [DeadLand VR](https://www.pcgamingwiki.com/wiki/?curid=95041)
 * [Deadlands Noir - That Old Time Religion](https://www.pcgamingwiki.com/wiki/?curid=47387)
-* [Deadliest Catch: The Game](https://www.pcgamingwiki.com/wiki/?curid=124121)
 * [Deadliners](https://www.pcgamingwiki.com/wiki/?curid=65325)
 * [Deadlings: Rotten Edition](https://www.pcgamingwiki.com/wiki/?curid=49351)
 * [Deadlock](https://www.pcgamingwiki.com/wiki/?curid=41603)
@@ -20419,7 +20419,6 @@
 * [MTB Downhill Simulator](https://www.pcgamingwiki.com/wiki/?curid=42864)
 * [MU Legend](https://www.pcgamingwiki.com/wiki/?curid=103963)
 * [Muay Thai Fighting](https://www.pcgamingwiki.com/wiki/?curid=99340)
-* [MUD Motocross World Championship](https://www.pcgamingwiki.com/wiki/?curid=40654)
 * [Muddledash](https://www.pcgamingwiki.com/wiki/?curid=99704)
 * [Muddy Heights 2](https://www.pcgamingwiki.com/wiki/?curid=43526)
 * [Muerte's Arena](https://www.pcgamingwiki.com/wiki/?curid=113400)
@@ -20604,7 +20603,6 @@
 * [My Free Farm](https://www.pcgamingwiki.com/wiki/?curid=143247)
 * [My Free Zoo](https://www.pcgamingwiki.com/wiki/?curid=76241)
 * [My Friend is a Raven](https://www.pcgamingwiki.com/wiki/?curid=155791)
-* [My Friend Peppa Pig](https://www.pcgamingwiki.com/wiki/?curid=172536)
 * [My Futanari Stepmom Impregnated Me](https://www.pcgamingwiki.com/wiki/?curid=184357)
 * [My Game City](https://www.pcgamingwiki.com/wiki/?curid=139550)
 * [My Giant Friend](https://www.pcgamingwiki.com/wiki/?curid=185640)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index 123018b6..724ca252 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -14836,6 +14836,17 @@
       executable: "Binaries\\\\Win32\\\\Magrunner.exe"
       workingdir: "Binaries\\\\Win32"
 209650:
+  cloud:
+    saves:
+      - path: players2
+        pattern: savegame.svg
+        root: gameinstall
+      - path: players2
+        pattern: keys.cfg
+        root: gameinstall
+      - path: players2
+        pattern: "*.s1"
+        root: gameinstall
   installDir: Call of Duty Advanced Warfare
   launch:
     - description: Launch
@@ -18860,6 +18871,14 @@
       description: Rugby Challenge 2 Settings Editor
       executable: "tools\\\\RugbyChallenge2SettingsEditor.exe"
 226780:
+  cloud:
+    saves:
+      - path: Milestone/MUD/
+        pattern: "*"
+        platforms:
+          - Windows
+        recursive: true
+        root: WinAppDataRoaming
   installDir: MUD Motocross World Championship
   launch:
     - config:
@@ -92430,6 +92449,19 @@
       executable: BattleSouls.app
       type: none
 392070:
+  cloud:
+    saves:
+      - path: /Game Swing/Stikbold
+        pattern: "*"
+        platforms:
+          - Windows
+        root: WinAppDataLocalLow
+    overrides:
+      - addPath: ""
+        os: Windows
+        osCompare: "="
+        root: gameinstall
+        useInstead: gameinstall
   installDir: Pumped BMX +
   launch:
     - config:
@@ -120118,6 +120150,14 @@
       executable: A Fold Apart.exe
       type: default
 451340:
+  cloud:
+    saves:
+      - path: CodeHorizon/GoldRushTheGame/Saves
+        pattern: "*"
+        platforms:
+          - Windows
+        recursive: true
+        root: WinAppDataLocalLow
   installDir: Gold Rush The Game
   launch:
     - config:
@@ -120130,6 +120170,10 @@
       description: SAFE MODE
       executable: GoldRushTheGame.exe
       type: option1
+    - config:
+        betakey: unstable.qa
+        oslist: windows
+      executable: GoldMiningSimulator.exe
 451350:
   installDir: Tropical Fish Shop 2
   launch:
@@ -141851,7 +141895,7 @@
         osarch: "64"
         oslist: windows
       description: Configure Controllers
-      executable: "ControllerConfig\\\\ControllerConfig.exe"
+      executable: "ControllerConfig\\ControllerConfig.exe"
       type: none
 508460: {}
 508520:
@@ -183957,6 +184001,25 @@
     schinese: 战律
     tchinese: 戰律
 607080:
+  cloud:
+    saves:
+      - path: Psychonauts2/Saved/SaveGames
+        pattern: Psychonauts2Save*.sav
+        root: WinAppDataLocal
+      - path: Psychonauts2/Saved/SaveGames
+        pattern: P2ConfigSaveSlot.sav
+        root: WinAppDataLocal
+    overrides:
+      - addPath: Epic/
+        os: MacOS
+        osCompare: "="
+        root: WinAppDataLocal
+        useInstead: MacAppSupport
+      - addPath: ".config/Epic/"
+        os: Linux
+        osCompare: "="
+        root: WinAppDataLocal
+        useInstead: LinuxHome
   installDir: Psychonauts 2
   launch:
     - config:
@@ -256540,6 +256603,26 @@
       executable: SabakunoNezumiDan.exe
       type: default
 785790:
+  cloud:
+    saves:
+      - path: Triband/WHAT THE GOLF_
+        pattern: GolfSave.golf
+        root: WinAppDataLocalLow
+    overrides:
+      - os: MacOS
+        osCompare: "="
+        pathTransforms:
+          - find: Triband/WHAT THE GOLF_
+            replace: com.thelabelgames.golfmac
+        root: WinAppDataLocalLow
+        useInstead: MacAppSupport
+      - os: Linux
+        osCompare: "="
+        pathTransforms:
+          - find: Triband/WHAT THE GOLF_
+            replace: ".config/unity3d/Triband/WHAT THE GOLF"
+        root: WinAppDataLocalLow
+        useInstead: LinuxHome
   installDir: WHAT THE GOLF
   launch:
     - config:
@@ -277199,6 +277282,18 @@
       executable: Slappy Ass.app
       type: default
 838630:
+  cloud:
+    saves:
+      - path: "Moonlit/DeadliestCatch/{64BitSteamID}/Saves"
+        pattern: "*.ddc"
+        platforms:
+          - Windows
+        root: WinAppDataLocalLow
+      - path: "Moonlit/DeadliestCatch/{64BitSteamID}/Headers"
+        pattern: "*.hdc"
+        platforms:
+          - Windows
+        root: WinAppDataLocalLow
   installDir: Deadliest Catch The Game
   launch:
     - config:
@@ -371572,32 +371667,58 @@
       executable: BakeryBizTycoon.exe
       type: default
 1101790:
+  cloud:
+    saves:
+      - path: WM/Savegames
+        pattern: "*.wmsav"
+        platforms:
+          - Windows
+        root: gameinstall
+      - path: com.destructivecreations.warmongrels/WM/Savegames
+        pattern: "*.wmsav"
+        platforms:
+          - MacOS
+        root: MacAppSupport
   installDir: War Mongrels
   launch:
-    - arguments: "-EnableCrashReports -DCPlatform=SteamFull"
-      executable: "WM\\\\Binaries\\\\Win64\\\\WM-Win64-Shipping.exe"
+    - arguments: "-EnableCrashReports -DCPlatform=SteamFull -DCGatherPlayerProfile -DCGatherSavegame"
+      config:
+        oslist: windows
+      executable: "WM\\Binaries\\Win64\\WM-Win64-Shipping.exe"
       type: default
-    - arguments: "-EnableCrashReports -DCPlatform=SteamFull -gpucrashdebugging"
+    - arguments: "-EnableCrashReports -DCPlatform=SteamFull -gpucrashdebugging -DCGatherPlayerProfile -DCGatherSavegame -fullmemorydump"
       config:
         betakey: internaltesting
+        oslist: windows
       description: Test Binary
-      executable: "WM\\\\Binaries\\\\Win64\\\\WM-Win64-Test.exe"
+      executable: "WM\\Binaries\\Win64\\WM-Win64-Test.exe"
       type: option1
     - config:
         betakey: amdprofiling
+        oslist: windows
       description: Test Binary
-      executable: "WM\\\\Binaries\\\\Win64\\\\WM-Win64-Test.exe"
-      type: none
+      executable: "WM\\Binaries\\Win64\\WM-Win64-Test.exe"
     - config:
         betakey: localizationtesting
+        oslist: windows
       description: Test Binary
-      executable: "WM\\\\Binaries\\\\Win64\\\\WM-Win64-Test.exe"
-      type: none
-    - arguments: "-EnableCrashReports -DCPlatform=SteamFull -gpucrashdebugging"
+      executable: "WM\\Binaries\\Win64\\WM-Win64-Test.exe"
+    - arguments: "-EnableCrashReports -DCPlatform=SteamFull -gpucrashdebugging -DCGatherPlayerProfile -DCGatherSavegame"
       config:
         betakey: internaltrunk
+        oslist: windows
       description: Test Binary
-      executable: "WM\\\\Binaries\\\\Win64\\\\WM-Win64-Test.exe"
+      executable: "WM\\Binaries\\Win64\\WM-Win64-Test.exe"
+    - config:
+        oslist: macos
+      executable: War Mongrels.app
+      type: default
+    - arguments: "-EnableCrashReports -DCPlatform=SteamFull -gpucrashdebugging -DCGatherPlayerProfile -DCGatherSavegame"
+      config:
+        betakey: defautl_test
+      description: Test Binary
+      executable: "WM\\Binaries\\Win64\\WM-Win64-Test.exe"
+      type: option1
   nameLocalized:
     schinese: 被遗忘的我们 / War Mongrels
     tchinese: 被遺忘的我們 / War Mongrels
@@ -431155,6 +431276,20 @@
       executable: B_17Launcher.exe
       type: config
 1635590:
+  cloud:
+    saves:
+      - path: "Outright Games/My Friend Peppa Pig/SaveData/CodenamePeppa/{64BitSteamID}"
+        pattern: "*.game.binary"
+        recursive: true
+        root: WinAppDataLocalLow
+    overrides:
+      - os: Linux
+        osCompare: "="
+        pathTransforms:
+          - find: ""
+            replace: ".config/unity3D/OutrightGames/MyFriendPeppaPig/SaveData/{64BitSteamID}"
+        root: WinAppDataLocal
+        useInstead: LinuxHome
   installDir: My Friend Peppa Pig
   launch:
     - executable: My Friend Peppa Pig.exe
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 6222725a..132169b2 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -16103,10 +16103,6 @@ Batman Returns:
     - 405033
     - 415650
     - 418930
-  templates:
-    - "{{Game data/config|Windows|{{p|game}}\\BMGame\\Config\\}}"
-    - "{{Game data/saves|Windows|{{p|game}}\\BMGame\\SaveData\\}}"
-    - "{{Game data/saves|Steam|{{p|steam}}\\userdata\\{{p|uid}}\\208650\\}}"
 "Batman: Arkham Origins":
   gog: 1908486934
   gogSide:
@@ -109755,6 +109751,9 @@ NASCAR Heat 2:
 NASCAR Heat 3:
   pageId: 109478
   steam: 905450
+  steamSide:
+    - 934130
+    - 934131
   templates:
     - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\704Games\\NASCAR Heat 3}}"
     - "{{Game data/saves|Windows|{{p|userprofile}}\\NASCAR Heat 3\\SaveData\\}}"
@@ -109773,6 +109772,17 @@ NASCAR Heat 5:
 NASCAR Heat Evolution:
   pageId: 39956
   steam: 508450
+  steamSide:
+    - 524630
+    - 525180
+    - 525181
+    - 525182
+    - 525183
+    - 525184
+    - 525185
+    - 525186
+    - 525187
+    - 525188
   templates:
     - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\Dusenberry Martin Racing\\NASCAR Heat Evolution}}"
     - "{{Game data/saves|Windows|{{p|userprofile}}\\NASCAR Heat Evolution\\SaveData\\}}"
@@ -127865,8 +127875,11 @@ Pump-Action Captain:
 Pumped BMX +:
   pageId: 38534
   steam: 392070
+  steamSide:
+    - 403140
   templates:
     - "{{Game data/config|Windows|{{P|userprofile}}\\AppData\\LocalLow\\Yeah Us_\\Pumped BMX _\\PlayerPrefs.txt}}"
+    - "{{Game data/saves|Windows|{{P|userprofile}}\\AppData\\LocalLow\\Yeah Us_\\Pumped BMX _\\PlayerPrefs.txt}}"
 Pumped BMX Pro:
   pageId: 127363
   steam: 966720
@@ -162318,6 +162331,8 @@ Taken:
 Takenoko:
   pageId: 152941
   steam: 865160
+  steamSide:
+    - 1028400
 Takeout food:
   pageId: 107680
   steam: 887670
@@ -189808,6 +189823,8 @@ War Inc. Battlezone:
 War Mongrels:
   pageId: 170777
   steam: 1101790
+  steamSide:
+    - 1788010
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\WM\\Saved\\Config\\WindowsNoEditor}}"
     - "{{Game data/saves|Windows|{{p|game}}\\WM\\Savegames}}"
@@ -192496,11 +192513,15 @@ What the Duck:
   steam: 1076970
 What the Golf?:
   gog: 1379120886
+  gogSide:
+    - 1894642988
   pageId: 87561
   steam: 785790
   templates:
     - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\Triband\\WHAT THE GOLF?\\}}"
+    - "{{Game data/config|OS X|{{p|osxhome}}/Library/Preferences/com.thelabelgames.golfmac.plist}}"
     - "{{Game data/saves|Windows|{{P|userprofile}}\\AppData\\LocalLow\\Triband\\WHAT THE GOLF_\\GolfSave.golf}}"
+    - "{{Game data/saves|OS X|{{p|osxhome}}/Library/Application Support/com.thelabelgames.golfmac/GolfSave.golf}}"
 What would Google say?:
   pageId: 110030
   steam: 920670