diff --git a/data/manifest.yaml b/data/manifest.yaml
index 730a439d..43ca7955 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -15094,6 +15094,13 @@ Actua Ice Hockey 2:
           - store: steam
   steam:
     id: 2152720
+Actua Pool:
+  files:
+    "<base>/SaveGame":
+      tags:
+        - save
+      when:
+        - os: windows
 Actua Soccer 2:
   installDir:
     Actua Soccer 2: {}
@@ -80204,6 +80211,11 @@ Broken Spell 2:
         - os: windows
   gog:
     id: 1207660323
+  id:
+    gogExtra:
+      - 1207660313
+    steamExtra:
+      - 565830
   installDir:
     Broken Sword 5: {}
   launch:
@@ -80250,19 +80262,6 @@ Broken Spell 2:
     id: 1207658707
   installDir:
     Broken Sword 2: {}
-  launch:
-    "<base>/BS2Remastered_i386":
-      - when:
-          - os: linux
-            store: steam
-    "<base>/Broken Sword - The Smoking Mirror - Remastered.app":
-      - when:
-          - os: mac
-            store: steam
-    "<base>/BrokenSword2.exe":
-      - when:
-          - os: windows
-            store: steam
   steam:
     id: 33600
 "Broken Sword: Shadow of the Templars: Director's Cut":
@@ -81128,6 +81127,12 @@ Buccaneer:
   steam:
     id: 2702120
 Buccaneers!:
+  files:
+    "<home>/AppData/LocalLow/Skyward Digital/Buccaneers/Saves":
+      tags:
+        - save
+      when:
+        - os: windows
   gog:
     id: 1396258045
   installDir:
@@ -246372,6 +246377,12 @@ Happy Quest:
   steam:
     id: 1418160
 Happy Room:
+  files:
+    "<home>/AppData/LocalLow/Mana Potion Studios/Happy Room":
+      tags:
+        - save
+      when:
+        - os: windows
   installDir:
     Happy Room: {}
   launch:
@@ -434444,6 +434455,22 @@ ReThink 2:
   steam:
     id: 934410
 ReThink 3:
+  files:
+    "<winLocalAppData>/RT3/Saved/Config/WindowsNoEditor":
+      tags:
+        - config
+      when:
+        - os: windows
+    "<winLocalAppData>/RT3/Saved/SaveGames/AutoSave.sav":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<winLocalAppData>/RT3/Saved/SaveGames/SETTINGS_*.sav":
+      tags:
+        - config
+      when:
+        - os: windows
   installDir:
     ReThink 3: {}
   launch:
@@ -554994,6 +555021,20 @@ The Fan:
             store: steam
   steam:
     id: 572330
+"The Fancy Pants Adventures: Classic Pack":
+  installDir:
+    Fancy Pants Adventures Classic Pack: {}
+  launch:
+    "<base>/FPA Classic Pack.app":
+      - when:
+          - os: mac
+            store: steam
+    "<base>/FPA Classic Pack/FPA Classic Pack.exe":
+      - when:
+          - os: windows
+            store: steam
+  steam:
+    id: 1668460
 The Far Frontier:
   installDir:
     The Far Frontier: {}
diff --git a/data/missing.md b/data/missing.md
index 72943623..5b4647cc 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -755,7 +755,6 @@
 * [Actua Golf](https://www.pcgamingwiki.com/wiki/?curid=184250)
 * [Actua Golf 3](https://www.pcgamingwiki.com/wiki/?curid=46621)
 * [Actua Ice Hockey](https://www.pcgamingwiki.com/wiki/?curid=183609)
-* [Actua Pool](https://www.pcgamingwiki.com/wiki/?curid=167625)
 * [Actua Soccer](https://www.pcgamingwiki.com/wiki/?curid=154914)
 * [Actua Soccer 2](https://www.pcgamingwiki.com/wiki/?curid=154921)
 * [Actua Soccer Club Edition](https://www.pcgamingwiki.com/wiki/?curid=154919)
@@ -4619,7 +4618,6 @@
 * [Bubonic: Outbreak](https://www.pcgamingwiki.com/wiki/?curid=44635)
 * [Bubsy: Paws on Fire!](https://www.pcgamingwiki.com/wiki/?curid=128531)
 * [Buccaneer](https://www.pcgamingwiki.com/wiki/?curid=192358)
-* [Buccaneers!](https://www.pcgamingwiki.com/wiki/?curid=150952)
 * [Buccaneers, Bounty & Boom!](https://www.pcgamingwiki.com/wiki/?curid=58658)
 * [Buck](https://www.pcgamingwiki.com/wiki/?curid=39638)
 * [Buck Zombies](https://www.pcgamingwiki.com/wiki/?curid=144023)
@@ -13923,7 +13921,6 @@
 * [Happy picture](https://www.pcgamingwiki.com/wiki/?curid=125587)
 * [Happy Pong](https://www.pcgamingwiki.com/wiki/?curid=36924)
 * [Happy Quest](https://www.pcgamingwiki.com/wiki/?curid=164405)
-* [Happy Room](https://www.pcgamingwiki.com/wiki/?curid=54822)
 * [Happy Santa](https://www.pcgamingwiki.com/wiki/?curid=75552)
 * [Happy Singh Adventures](https://www.pcgamingwiki.com/wiki/?curid=64484)
 * [Happy Stealing with Kirisame Marisa](https://www.pcgamingwiki.com/wiki/?curid=99296)
@@ -25383,7 +25380,6 @@
 * [Retaliation Path of Rome](https://www.pcgamingwiki.com/wiki/?curid=51513)
 * [Retaliation: Enemy Mine](https://www.pcgamingwiki.com/wiki/?curid=44866)
 * [Retention](https://www.pcgamingwiki.com/wiki/?curid=48971)
-* [ReThink 3](https://www.pcgamingwiki.com/wiki/?curid=143750)
 * [ReThink 4](https://www.pcgamingwiki.com/wiki/?curid=165297)
 * [ReThink: Evolved 4](https://www.pcgamingwiki.com/wiki/?curid=165295)
 * [ReThink: Evolved 5](https://www.pcgamingwiki.com/wiki/?curid=192102)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index 200e4daf..b80532ef 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -5813,38 +5813,52 @@
   launch:
     - config:
         oslist: windows
-      executable: BrokenSword2.exe
-    - config:
-        oslist: macos
-      executable: Broken Sword - The Smoking Mirror - Remastered.app
+      description: "Broken Sword 2: Remastered"
+      executable: BS2.exe
+      type: option1
     - config:
         oslist: linux
-      executable: BS2Remastered_i386
+      description: "Broken Sword 2: Remastered"
+      executable: BS2
+      type: option1
+    - config:
+        oslist: macos
+      description: "Broken Sword 2: Remastered"
+      executable: BS2.app
+      type: option1
     - arguments: "-c"
       config:
         oslist: windows
         ownsdlc: "580440"
       description: "Broken Sword 2: Original Version"
       executable: Launcher.exe
-      type: option1
-    - arguments: "-c"
-      config:
-        oslist: macos
-        ownsdlc: "580440"
-      description: "Broken Sword 2: Original Version"
-      executable: Launcher.app/Contents/MacOS/Launcher
-      type: option1
+      type: option2
     - arguments: "-c"
       config:
         oslist: linux
         ownsdlc: "580440"
       description: "Broken Sword 2: Original Version"
       executable: Launcher
-      type: option1
+      type: option2
+    - arguments: "-c"
+      config:
+        oslist: macos
+        ownsdlc: "580440"
+      description: "Broken Sword 2: Original Version"
+      executable: Launcher.app/Contents/MacOS/Launcher
+      type: option2
+  nameLocalized:
+    french: "Les Chevaliers de Baphomet 2 - Les Boucliers de Quetzalcoatl: Remasterisé"
+    german: "Baphomets Fluch 2 - Die Spiegel der Finsternis: Remastered"
+    italian: "Broken Sword 2 – La profezia dei Maya: Rimasterizzato"
+    spanish: "Broken Sword 2 - Las Fuerzas del Mal: Remasterizado"
 33610:
   installDir: Broken Sword 3
   launch:
     - executable: BSTSD.exe
+  nameLocalized:
+    french: Les Chevaliers de Baphomet 3 - Le manuscrit de Voynich
+    german: Baphomets Fluch 3 - Der schlafende Drache
 33620:
   installDir: Crash Time III
   launch:
@@ -8763,6 +8777,11 @@
       description: "Broken Sword 1: Original Version"
       executable: Launcher
       type: option1
+  nameLocalized:
+    french: "Les Chevaliers de Baphomet: The Director's Cut"
+    german: "Baphomets Fluch: The Director’s cut"
+    italian: "Broken Sword - Il Segreto dei Templari: The Director's Cut"
+    spanish: "Broken Sword - La Leyenda de los Templarios: Montaje del Director"
 57650:
   installDir: Dungeons
   launch:
@@ -29039,12 +29058,12 @@
       executable: BS5
       type: default
   nameLocalized:
-    french: "Les Chevaliers de Baphomet 5 : La Malédiction du Serpent"
+    french: Les Chevaliers de Baphomet 5 - La Malédiction du Serpent
     german: Baphomets Fluch 5 - Der Sündenfall
     italian: Broken Sword 5 - La maledizione del serpente
     polish: Broken Sword 5 – Klątwa Węża
-    russian: "Сломанный Меч 5: Проклятие Змея"
-    spanish: "Broken Sword 5: La maldición de la serpiente"
+    russian: Сломанный Меч 5 - Проклятие Змея
+    spanish: Broken Sword 5 - La maldición de la serpiente
 262960:
   installDir: Castle In The Darkness
   launch:
@@ -49995,6 +50014,11 @@
         oslist: windows
       description: Launch
       executable: bs4.exe
+  nameLocalized:
+    french: Les Chevaliers de Baphomet 4 - Les Gardiens du Temple de Salomon
+    german: Baphomets Fluch 4 - Der Engel des Todes
+    italian: "Broken Sword 4 - L'Angelo della Morte"
+    spanish: Broken Sword 4 - El Ángel de la Muerte
 316180:
   installDir: A City Sleeps
   launch:
@@ -426881,6 +426905,17 @@
     - config:
         oslist: macos
       executable: Dungeons.app
+1668460:
+  installDir: Fancy Pants Adventures Classic Pack
+  launch:
+    - config:
+        oslist: macos
+      executable: FPA Classic Pack.app
+      type: default
+    - config:
+        oslist: windows
+      executable: "FPA Classic Pack\\FPA Classic Pack.exe"
+      type: default
 1668510:
   installDir: The Legend of Heroes Trails from Zero
   launch:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 7e61a628..ecbeca18 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -4359,6 +4359,8 @@ Actua Ice Hockey 2:
     - "{{Game data/saves|Windows|{{p|game}}\\saves}}"
 Actua Pool:
   pageId: 167625
+  templates:
+    - "{{Game data/saves|Windows|{{p|game}}\\SaveGame}}"
 Actua Soccer:
   pageId: 154914
 Actua Soccer 2:
@@ -24010,10 +24012,14 @@ Broken Spell 2:
     - "{{Game data/saves|Windows|{{p|userprofile\\Documents}}\\Broken Sword - The Angel of Death\\}}"
 "Broken Sword 5: The Serpent's Curse":
   gog: 1207660323
+  gogSide:
+    - 1207660313
   pageId: 13318
   renamedFrom:
     - "Broken Sword 5 - The Serpent's Curse"
   steam: 262940
+  steamSide:
+    - 565830
   templates:
     - "{{Game data/config|Windows|{{p|userprofile\\Documents}}\\Broken Sword 5\\vt7.ini}}"
     - "{{Game data/config|OS X|{{P|osxhome}}/Library/Application Support/Broken Sword 5/}}"
@@ -24316,6 +24322,8 @@ Buccaneers!:
   gog: 1396258045
   pageId: 150952
   steam: 1148560
+  templates:
+    - "{{Game data/saves|Windows|{{p|userprofile\\appdata\\locallow}}\\Skyward Digital\\Buccaneers\\Saves}}"
 "Buccaneers, Bounty & Boom!":
   pageId: 58658
   steam: 597640
@@ -73835,6 +73843,8 @@ Happy Quest:
 Happy Room:
   pageId: 54822
   steam: 550010
+  templates:
+    - "{{Game data/saves|Windows|{{P|userprofile}}\\AppData\\LocalLow\\Mana Potion Studios\\Happy Room\\}}"
 Happy STG:
   pageId: 149315
   steam: 1153580
@@ -130458,6 +130468,9 @@ ReThink 2:
 ReThink 3:
   pageId: 143750
   steam: 1136040
+  templates:
+    - "{{Game data/config|Windows|{{P|localappdata}}\\RT3\\Saved\\SaveGames\\SETTINGS_*.sav|{{P|localappdata}}\\RT3\\Saved\\Config\\WindowsNoEditor\\}}"
+    - "{{Game data/saves|Windows|{{P|localappdata}}\\RT3\\Saved\\SaveGames\\AutoSave.sav}}"
 ReThink 4:
   pageId: 165297
   steam: 1436410
@@ -166209,6 +166222,7 @@ The Fan:
   steam: 572330
 "The Fancy Pants Adventures: Classic Pack":
   pageId: 192615
+  steam: 1668460
 The Far Frontier:
   pageId: 68579
   steam: 612510