diff --git a/data/manifest.yaml b/data/manifest.yaml
index 77d37bbb..696bf0f8 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -43075,6 +43075,17 @@ Atari Vault:
   steam:
     id: 2790
 "Atelier Ayesha: The Alchemist of Dusk DX":
+  files:
+    "<base>/Setting.ini":
+      tags:
+        - config
+      when:
+        - os: windows
+    "<winDocuments>/KoeiTecmo/Atelier Ayesha DX/SAVEDATA":
+      tags:
+        - save
+      when:
+        - os: windows
   installDir:
     Atelier Ayesha DX: {}
   launch:
@@ -103580,6 +103591,9 @@ Clash Force:
 Clash II:
   gog:
     id: 1726427840
+  id:
+    gogExtra:
+      - 1346505318
   installDir:
     Clash II: {}
   launch:
@@ -202077,16 +202091,16 @@ Final Doom:
     Final Doom: {}
   launch:
     "<base>/base/dosbox.exe":
-      - arguments: "-conf .\\\\base\\\\plutoniam.conf -fullscreen -exit"
+      - arguments: "-conf .\\base\\plutoniam.conf -fullscreen -exit"
         when:
           - store: steam
-      - arguments: "-conf .\\\\base\\\\plutonia.conf -fullscreen -exit"
+      - arguments: "-conf .\\base\\plutonia.conf -fullscreen -exit"
         when:
           - store: steam
-      - arguments: "-conf .\\\\base\\\\tntm.conf -fullscreen -exit"
+      - arguments: "-conf .\\base\\tntm.conf -fullscreen -exit"
         when:
           - store: steam
-      - arguments: "-conf .\\\\base\\\\tnt.conf -fullscreen -exit"
+      - arguments: "-conf .\\base\\tnt.conf -fullscreen -exit"
         when:
           - store: steam
   steam:
@@ -230593,6 +230607,14 @@ Goat Simulator 3:
         - save
       when:
         - os: windows
+  installDir:
+    Goat Simulator 3: {}
+  launch:
+    "<base>/Goat2.exe":
+      - when:
+          - bit: 64
+            os: windows
+            store: steam
   steam:
     id: 850190
 Goat of Duty:
@@ -241623,6 +241645,28 @@ Gunscape:
             store: steam
   steam:
     id: 342480
+Gunship:
+  gog:
+    id: 1900371970
+  installDir:
+    Gunship and Gunship 2000: {}
+  launch:
+    "<base>/Launcher/ConsoleLauncher.exe":
+      - when:
+          - store: steam
+  steam:
+    id: 2766090
+Gunship 2000:
+  gog:
+    id: 1900371970
+  installDir:
+    Gunship and Gunship 2000: {}
+  launch:
+    "<base>/Launcher/ConsoleLauncher.exe":
+      - when:
+          - store: steam
+  steam:
+    id: 2766090
 "Gunship Battle2 VR: Steam Edition":
   installDir:
     Gunship Battle2 VR: {}
@@ -246915,6 +246959,28 @@ Hard-Life:
 HardBall:
   steam:
     id: 688550
+HardBall II:
+  gog:
+    id: 1630022897
+  installDir:
+    HardBall! + HardBall II: {}
+  launch:
+    "<base>/Launcher/ConsoleLauncher.exe":
+      - when:
+          - store: steam
+  steam:
+    id: 2766080
+HardBall!:
+  gog:
+    id: 1630022897
+  installDir:
+    HardBall! + HardBall II: {}
+  launch:
+    "<base>/Launcher/ConsoleLauncher.exe":
+      - when:
+          - store: steam
+  steam:
+    id: 2766080
 HardCube:
   steam:
     id: 493730
@@ -278149,6 +278215,13 @@ Inklings:
 Inkulinati:
   gog:
     id: 1788295898
+  id:
+    gogExtra:
+      - 1433105581
+      - 1861207243
+    steamExtra:
+      - 2208540
+      - 2223510
   installDir:
     Inkulinati: {}
   launch:
@@ -393168,6 +393241,17 @@ Pachansky Mathematics 2+2=8:
   steam:
     id: 918260
 Pacific Drive:
+  files:
+    "<winLocalAppData>/../Local/PenDriverProIntro/Saved/Config":
+      tags:
+        - config
+      when:
+        - os: windows
+    "<winLocalAppData>/../Local/PenDriverProIntro/Saved/SaveGames":
+      tags:
+        - save
+      when:
+        - os: windows
   id:
     steamExtra:
       - 2646730
@@ -431470,6 +431554,13 @@ Railway Empire:
   steam:
     id: 503940
 Railway Empire 2:
+  id:
+    steamExtra:
+      - 2357330
+      - 2419150
+      - 2419151
+      - 2419152
+      - 2517380
   installDir:
     Railway Empire 2: {}
   launch:
@@ -587786,6 +587877,13 @@ Toki Tori 2+:
             store: steam
   steam:
     id: 201420
+"Tokimeki Memorial: Forever With You":
+  files:
+    "C:/Program Files/konami/tokimeki":
+      tags:
+        - save
+      when:
+        - os: windows
 Tokyo 42:
   files:
     "<base>/T42_Data/Managed/TOKYO42/<storeUserId>":
@@ -626287,6 +626385,7 @@ Warhalla:
       - 1109339657
       - 1193985497
       - 1743116974
+      - 1750565958
       - 1882106758
       - 1894360794
       - 2004956225
@@ -626298,6 +626397,7 @@ Warhalla:
       - 2011980
       - 2199370
       - 2305830
+      - 2583910
   installDir:
     Warhammer 40000 Battlesector: {}
   steam:
@@ -650467,6 +650567,17 @@ Zapitalism:
         - save
       when:
         - os: windows
+  gog:
+    id: 1909443731
+  installDir:
+    Zapper One Wicked Cricket: {}
+  launch:
+    "<base>/Launcher/ConsoleLauncher.exe":
+      - when:
+          - os: windows
+            store: steam
+  steam:
+    id: 2766060
 Zarvot:
   steam:
     id: 992930
diff --git a/data/missing.md b/data/missing.md
index 62aa85f0..7ba46de5 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -2391,7 +2391,6 @@
 * [Ataque Marino](https://www.pcgamingwiki.com/wiki/?curid=125306)
 * [Atari Anniversary Edition](https://www.pcgamingwiki.com/wiki/?curid=171178)
 * [Atari: 80 Classic Games in One!](https://www.pcgamingwiki.com/wiki/?curid=87772)
-* [Atelier Ayesha: The Alchemist of Dusk DX](https://www.pcgamingwiki.com/wiki/?curid=155087)
 * [Atelier Elie: The Alchemist of Salburg 2](https://www.pcgamingwiki.com/wiki/?curid=162382)
 * [Atelier Escha & Logy: Alchemists of the Dusk Sky DX](https://www.pcgamingwiki.com/wiki/?curid=155089)
 * [Atelier Marie: The Alchemist of Salburg](https://www.pcgamingwiki.com/wiki/?curid=155193)
@@ -13725,6 +13724,7 @@
 * [Guns'n'Stories: Preface VR](https://www.pcgamingwiki.com/wiki/?curid=89254)
 * [Gunscape](https://www.pcgamingwiki.com/wiki/?curid=44359)
 * [Gunship](https://www.pcgamingwiki.com/wiki/?curid=181397)
+* [Gunship 2000](https://www.pcgamingwiki.com/wiki/?curid=193226)
 * [Gunship Battle2 VR: Steam Edition](https://www.pcgamingwiki.com/wiki/?curid=75516)
 * [Gunship Recon](https://www.pcgamingwiki.com/wiki/?curid=135016)
 * [Gunsister](https://www.pcgamingwiki.com/wiki/?curid=164958)
@@ -13961,6 +13961,7 @@
 * [Hard Work](https://www.pcgamingwiki.com/wiki/?curid=95186)
 * [Hard-Life](https://www.pcgamingwiki.com/wiki/?curid=176540)
 * [HardBall](https://www.pcgamingwiki.com/wiki/?curid=67873)
+* [HardBall II](https://www.pcgamingwiki.com/wiki/?curid=193219)
 * [HardBall!](https://www.pcgamingwiki.com/wiki/?curid=167299)
 * [Hardcore Bunny Jumper](https://www.pcgamingwiki.com/wiki/?curid=135161)
 * [Hardcore Maze Cube - Puzzle Survival Game](https://www.pcgamingwiki.com/wiki/?curid=150697)
@@ -22532,7 +22533,6 @@
 * [Pac-Man Pizza Parlor](https://www.pcgamingwiki.com/wiki/?curid=146523)
 * [PacaPlus](https://www.pcgamingwiki.com/wiki/?curid=60081)
 * [Pachansky Mathematics 2+2=8](https://www.pcgamingwiki.com/wiki/?curid=108408)
-* [Pacific Drive](https://www.pcgamingwiki.com/wiki/?curid=193168)
 * [Pacific Liberation Force](https://www.pcgamingwiki.com/wiki/?curid=49645)
 * [Pacific Storm 6 - Battle for Normandy](https://www.pcgamingwiki.com/wiki/?curid=121311)
 * [Pacific Storm: Allies](https://www.pcgamingwiki.com/wiki/?curid=41343)
@@ -33438,7 +33438,6 @@
 * [Tokaido](https://www.pcgamingwiki.com/wiki/?curid=77606)
 * [Toki](https://www.pcgamingwiki.com/wiki/?curid=138186)
 * [Toki Time Trial](https://www.pcgamingwiki.com/wiki/?curid=103173)
-* [Tokimeki Memorial: Forever With You](https://www.pcgamingwiki.com/wiki/?curid=171564)
 * [TOKOYO: The Tower of Perpetuity](https://www.pcgamingwiki.com/wiki/?curid=183922)
 * [Tokyo Babel](https://www.pcgamingwiki.com/wiki/?curid=43849)
 * [Tokyo Chronos](https://www.pcgamingwiki.com/wiki/?curid=130068)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index 4cfbb7ca..3de67e45 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -863,17 +863,17 @@
 2290:
   installDir: Final Doom
   launch:
-    - arguments: "-conf .\\\\base\\\\plutoniam.conf -fullscreen -exit"
-      executable: "base\\\\dosbox.exe"
-    - arguments: "-conf .\\\\base\\\\plutonia.conf -fullscreen -exit"
+    - arguments: "-conf .\\base\\plutoniam.conf -fullscreen -exit"
+      executable: "base\\dosbox.exe"
+    - arguments: "-conf .\\base\\plutonia.conf -fullscreen -exit"
       description: Launch Plutonia Mission with classic controls
-      executable: "base\\\\dosbox.exe"
-    - arguments: "-conf .\\\\base\\\\tntm.conf -fullscreen -exit"
+      executable: "base\\dosbox.exe"
+    - arguments: "-conf .\\base\\tntm.conf -fullscreen -exit"
       description: "Launch Final Doom: TNT Evilution"
-      executable: "base\\\\dosbox.exe"
-    - arguments: "-conf .\\\\base\\\\tnt.conf -fullscreen -exit"
+      executable: "base\\dosbox.exe"
+    - arguments: "-conf .\\base\\tnt.conf -fullscreen -exit"
       description: "Launch Final Doom: TNT Evilution with classic controls"
-      executable: "base\\\\dosbox.exe"
+      executable: "base\\dosbox.exe"
 2300:
   installDir: Doom 2
   launch:
@@ -278901,7 +278901,14 @@
   nameLocalized:
     schinese: Number Guesser 猜数字的人
     tchinese: Number Guesser 猜數字的人
-850190: {}
+850190:
+  installDir: Goat Simulator 3
+  launch:
+    - config:
+        osarch: "64"
+        oslist: windows
+      executable: Goat2.exe
+      type: default
 850230:
   installDir: "Women's Soccer Manager"
   launch:
@@ -411324,7 +411331,7 @@
   installDir: Warhammer 40000 Battlesector
   launch:
     - config:
-        betakey: default devtest battlesectorgw blacklabtest devtest2 preview battlesectorbeta
+        betakey: default devtest battlesectorgw blacklabtest devtest2 preview battlesectorbeta legacy
         osarch: "64"
         oslist: windows
       description: Launcher
@@ -411337,6 +411344,8 @@
       description: Launch Game
       executable: Warhammer 40K Battlesector.exe
       type: none
+  nameLocalized:
+    schinese: "战锤40,000：战区"
 1295510:
   installDir: DRAGON QUEST XI S
   launch:
@@ -441624,6 +441633,20 @@
       executable: OffRoad/OffRoad.exe
       type: option1
       workingdir: OffRoad
+2766060:
+  installDir: Zapper One Wicked Cricket
+  launch:
+    - config:
+        oslist: windows
+      executable: Launcher/ConsoleLauncher.exe
+2766080:
+  installDir: HardBall! + HardBall II
+  launch:
+    - executable: Launcher/ConsoleLauncher.exe
+2766090:
+  installDir: Gunship and Gunship 2000
+  launch:
+    - executable: Launcher/ConsoleLauncher.exe
 2766220: {}
 2771670:
   installDir: Psychopomp
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index c84c4461..d653d7fc 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -12691,6 +12691,9 @@ Atari Vault:
 "Atelier Ayesha: The Alchemist of Dusk DX":
   pageId: 155087
   steam: 1152300
+  templates:
+    - "{{Game data/config|Windows|{{P|game}}\\Setting.ini}}"
+    - "{{Game data/saves|Windows|{{P|userprofile\\Documents}}\\KoeiTecmo\\Atelier Ayesha DX\\SAVEDATA}}"
 "Atelier Elie: The Alchemist of Salburg 2":
   pageId: 162382
 "Atelier Escha & Logy: Alchemists of the Dusk Sky DX":
@@ -31038,6 +31041,8 @@ Clash Force:
   steam: 703620
 Clash II:
   gog: 1726427840
+  gogSide:
+    - 1346505318
   pageId: 167387
   steam: 1347760
 Clash of Cards:
@@ -72435,7 +72440,13 @@ Gunscape:
   pageId: 44359
   steam: 342480
 Gunship:
+  gog: 1900371970
   pageId: 181397
+  steam: 2766090
+Gunship 2000:
+  gog: 1900371970
+  pageId: 193226
+  steam: 2766090
 "Gunship Battle2 VR: Steam Edition":
   pageId: 75516
   steam: 700990
@@ -73996,8 +74007,14 @@ Hard-Life:
 HardBall:
   pageId: 67873
   steam: 688550
+HardBall II:
+  gog: 1630022897
+  pageId: 193219
+  steam: 2766080
 HardBall!:
+  gog: 1630022897
   pageId: 167299
+  steam: 2766080
 HardCube:
   pageId: 35146
   steam: 493730
@@ -83296,8 +83313,14 @@ Inklings:
   steam: 498720
 Inkulinati:
   gog: 1788295898
+  gogSide:
+    - 1433105581
+    - 1861207243
   pageId: 122908
   steam: 957960
+  steamSide:
+    - 2208540
+    - 2223510
 Inlight:
   pageId: 105423
   steam: 907600
@@ -118025,6 +118048,9 @@ Pacific Drive:
   steamSide:
     - 2646730
     - 2790060
+  templates:
+    - "{{Game data/config|Windows|%localappdata%\\..\\Local\\PenDriverProIntro\\Saved\\Config}}"
+    - "{{Game data/saves|Windows|%localappdata%\\..\\Local\\PenDriverProIntro\\Saved\\SaveGames}}"
 Pacific General:
   gog: 1430136184
   pageId: 131866
@@ -129529,6 +129555,12 @@ Railway Empire:
 Railway Empire 2:
   pageId: 187389
   steam: 1644320
+  steamSide:
+    - 2357330
+    - 2419150
+    - 2419151
+    - 2419152
+    - 2517380
 Railway Islands - Puzzle:
   pageId: 183229
   steam: 1807930
@@ -175970,6 +176002,8 @@ Toki Tori 2+:
     - "{{Game data/saves|Steam|{{p|steam}}/userdata/{{P|uid}}/201420/}}"
 "Tokimeki Memorial: Forever With You":
   pageId: 171564
+  templates:
+    - "{{Game data/saves|Windows|{{P|programfiles}}\\konami\\tokimeki}}"
 Tokyo 42:
   gog: 1300381715
   pageId: 39658
@@ -188587,6 +188621,7 @@ Warhalla:
     - 1109339657
     - 1193985497
     - 1743116974
+    - 1750565958
     - 1882106758
     - 1894360794
     - 2004956225
@@ -188600,6 +188635,7 @@ Warhalla:
     - 2011980
     - 2199370
     - 2305830
+    - 2583910
 "Warhammer 40,000: Boltgun":
   gog: 2028053392
   pageId: 178007
@@ -195882,7 +195918,9 @@ Zapitalism:
   pageId: 156487
   steam: 1173230
 "Zapper: One Wicked Cricket":
+  gog: 1909443731
   pageId: 140356
+  steam: 2766060
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\zapper.dat}}"
     - "{{Game data/saves|Windows|{{p|game}}\\zappersave.lee}}"