diff --git a/data/manifest.yaml b/data/manifest.yaml
index 33d03b7e..a4117e0b 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -3452,7 +3452,7 @@ $1 Ride:
         - os: windows
 "3-D Ultra Pinball: Thrillride":
   files:
-    HKEY_CLASSES_ROOT/VirtualStore/MACHINE/SOFTWARE:
+    HKEY_CLASSES_ROOT/VirtualStore/MACHINE/SOFTWARE/WOW6432Node/Sierra On-Line/3D Ultra Pinball Thrillride/Settings:
       tags:
         - config
       when:
@@ -40445,6 +40445,17 @@ Approaching Blocks:
   steam:
     id: 467390
 April 24th:
+  files:
+    "<winLocalAppData>/April_24th/Saved/Config/WindowsNoEditor":
+      tags:
+        - config
+      when:
+        - os: windows
+    "<winLocalAppData>/April_24th/Saved/SaveGames":
+      tags:
+        - save
+      when:
+        - os: windows
   installDir:
     April 24th: {}
   launch:
@@ -394046,6 +394057,17 @@ Marvel Snap:
 "Marvel vs. Capcom Fighting Collection: Arcade Classics":
   cloud:
     steam: true
+  files:
+    "<base>/config.ini":
+      tags:
+        - config
+      when:
+        - os: windows
+    "<root>/userdata/<storeUserId>/2634890/remote":
+      tags:
+        - save
+      when:
+        - store: steam
   installDir:
     MARVEL vs. CAPCOM Fighting Collection: {}
   launch:
@@ -520880,11 +520902,6 @@ Resident Evil 6:
         - config
       when:
         - os: windows
-    "<root>/userdata/<storeUserId>/418370/remote":
-      tags:
-        - save
-      when:
-        - store: steam
     "<root>/userdata/<storeUserId>/530620":
       tags:
         - save
@@ -757944,6 +757961,23 @@ World of Golf:
     id: 511560
 World of Goo:
   alias: World of Goo (2019)
+World of Goo (2008):
+  files:
+    "<home>/Library/Application Support/WorldOfGoo":
+      tags:
+        - save
+      when:
+        - os: mac
+    "<home>/Library/Application Support/WorldOfGoo/config.txt":
+      tags:
+        - config
+      when:
+        - os: mac
+    "<winProgramData>/2DBOY/WorldofGoo":
+      tags:
+        - config
+      when:
+        - os: windows
 World of Goo (2019):
   cloud:
     steam: true
diff --git a/data/missing.md b/data/missing.md
index 54b35e67..54647c63 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -1510,7 +1510,6 @@
 * [AppleSnake: Christmas Story](https://www.pcgamingwiki.com/wiki/?curid=87053)
 * [AppleSnake: Halloween Adventures](https://www.pcgamingwiki.com/wiki/?curid=82012)
 * [Approaching Blocks](https://www.pcgamingwiki.com/wiki/?curid=42692)
-* [April 24th](https://www.pcgamingwiki.com/wiki/?curid=196825)
 * [APT](https://www.pcgamingwiki.com/wiki/?curid=46683)
 * [Aqua Fish](https://www.pcgamingwiki.com/wiki/?curid=78453)
 * [Aqua Lungers](https://www.pcgamingwiki.com/wiki/?curid=89624)
@@ -15478,7 +15477,6 @@
 * [Marvel End Time Arena](https://www.pcgamingwiki.com/wiki/?curid=87509)
 * [Marvel Powers United VR](https://www.pcgamingwiki.com/wiki/?curid=165488)
 * [Marvel Rivals](https://www.pcgamingwiki.com/wiki/?curid=194000)
-* [Marvel vs. Capcom Fighting Collection: Arcade Classics](https://www.pcgamingwiki.com/wiki/?curid=195829)
 * [Marvin the Hatter](https://www.pcgamingwiki.com/wiki/?curid=132619)
 * [Marvin's Mittens](https://www.pcgamingwiki.com/wiki/?curid=37164)
 * [Marwin and The Evolution Stone](https://www.pcgamingwiki.com/wiki/?curid=39880)
@@ -29651,7 +29649,6 @@
 * [World of Feudal](https://www.pcgamingwiki.com/wiki/?curid=95262)
 * [World of Fishing](https://www.pcgamingwiki.com/wiki/?curid=33800)
 * [World of Golf](https://www.pcgamingwiki.com/wiki/?curid=51316)
-* [World of Goo (2008)](https://www.pcgamingwiki.com/wiki/?curid=167088)
 * [World of Guns: VR](https://www.pcgamingwiki.com/wiki/?curid=144341)
 * [World of Hex](https://www.pcgamingwiki.com/wiki/?curid=168274)
 * [World of Leaders](https://www.pcgamingwiki.com/wiki/?curid=49095)
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 59b801f8..30b5de45 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -1083,7 +1083,7 @@ $1 Ride:
 "3-D Ultra Pinball: Thrillride":
   pageId: 196080
   templates:
-    - "{{Game data/config|Windows|HKEY_CLASSES_ROOT\\VirtualStore\\MACHINE\\SOFTWARE|{{P|wow64}}\\Sierra On-Line\\3D Ultra Pinball Thrillride\\Settings}}"
+    - "{{Game data/config|Windows|HKEY_CLASSES_ROOT\\VirtualStore\\MACHINE\\SOFTWARE\\WOW6432Node\\Sierra On-Line\\3D Ultra Pinball Thrillride\\Settings}}"
 3-D Ultra Radio Control Racers:
   pageId: 8402
 3-in-1 Bundle Brain Trainings:
@@ -12548,6 +12548,9 @@ Approaching Blocks:
 April 24th:
   pageId: 196825
   steam: 2907190
+  templates:
+    - "{{Game data/config|Windows|{{P|localappdata}}\\April_24th\\Saved\\Config\\WindowsNoEditor\\}}"
+    - "{{Game data/saves|Windows|{{P|localappdata}}\\April_24th\\Saved\\SaveGames\\}}"
 "Apsulov: End of Gods":
   cloud:
     gog: true
@@ -17606,7 +17609,6 @@ BALSA Model Flight Simulator:
   steam: 341440
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\}}"
-    - "{{Game data/saves|Windows|{{p|windir}}\\}}"
 BARDO:
   pageId: 121621
   steam: 939230
@@ -37840,7 +37842,6 @@ Circuits:
   pageId: 34030
   steam: 282760
   templates:
-    - "{{Game data/config|Windows|{{p|steam}}\\config\\}}"
     - "{{Game data/saves|Windows|{{p|hkcu}}\\Software\\Digital Tentacle S.L.\\Circuits\\}}"
     - "{{Game data/saves|Linux|\"~/.config/unity3d/Digital Tentacle S.L./Circuits/prefs\"}}"
 Circularity:
@@ -42890,7 +42891,6 @@ Corruption of Champions II:
   pageId: 21963
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\corsairs.ini}}"
-    - "{{Game data/saves|Windows|{{p|userprofile\\documents}}}}"
 Cortex:
   pageId: 103879
   steam: 909580
@@ -64680,7 +64680,6 @@ Ecco Jr.:
 Ecco the Dolphin:
   pageId: 25675
   templates:
-    - "{{Game data/config|Windows|{{p|windir}}\\}}"
     - "{{Game data/saves|Windows|{{p|game}}\\dol32nt.stg}}"
 Ecco the Dolphin (2010):
   pageId: 30875
@@ -94539,9 +94538,6 @@ Helskate:
     steam: true
   pageId: 195259
   steam: 1295630
-  templates:
-    - "{{Game data/saves|Windows|{{p|userprofile}}}}"
-    - "{{Game data/saves|OS X|{{p|osxhome}}}}"
 Helvetii:
   pageId: 139724
   steam: 1094590
@@ -124795,6 +124791,9 @@ Marvel Snap:
     steam: true
   pageId: 195829
   steam: 2634890
+  templates:
+    - "{{Game data/config|Windows|{{P|game}}\\config.ini}}"
+    - "{{Game data/saves|Steam|{{p|steam}}\\userdata\\{{p|uid}}\\2634890\\remote\\}}"
 "Marvel vs. Capcom: Infinite":
   cloud:
     steam: true
@@ -125923,8 +125922,6 @@ Meadow Fun!!:
 Meadowland:
   pageId: 49466
   steam: 320120
-  templates:
-    - "{{Game data/saves|Windows|{{p|APPDATA}}\\MMFApplications\n}}"
 Mean Routine:
   pageId: 122316
   steam: 968990
@@ -152447,7 +152444,6 @@ Pixel Dungeon:
     - "{{Game data/config|Windows|{{P|userprofile}}\\Saved Games\\pd-prefs}}"
     - "{{Game data/config|OS X|{{P|osxhome}}/Library/Application Support/Pixel Dungeon/pd-prefs}}"
     - "{{Game data/config|Linux|{{P|linuxhome}}/.watabou/pixel-dungeon/pd-prefs}}"
-    - "{{Game data/saves|Windows|{{P|userprofile}}\\Saved Games\\}}"
     - "{{Game data/saves|OS X|{{P|osxhome}}/Library/Application Support/Pixel Dungeon/}}"
     - "{{Game data/saves|Linux|{{P|linuxhome}}/.watabou/pixel-dungeon/}}"
 Pixel Express:
@@ -165615,7 +165611,7 @@ Resident Evil 6:
     - 530620
   templates:
     - "{{Game data/config|Windows|{{p|game}}/re7_config.ini}}"
-    - "{{Game data/saves|Steam|{{p|Steam}}/userdata/{{p|uid}}/530620/|{{p|Steam}}/userdata/{{p|uid}}/418370/remote}}"
+    - "{{Game data/saves|Steam|{{p|Steam}}/userdata/{{p|uid}}/530620/}}"
 "Resident Evil 7: Biohazard":
   cloud:
     steam: true
@@ -219713,8 +219709,6 @@ Tiny Tanks:
     steam: true
   pageId: 195452
   steam: 2238040
-  templates:
-    - "{{Game data/saves|Windows|{{p|userprofile}}}}"
 Tiny Thief:
   pageId: 13454
   steam: 257080
@@ -238959,10 +238953,6 @@ Whirlygig:
     steam: true
   pageId: 195435
   steam: 2140100
-  templates:
-    - "{{Game data/saves|Windows|{{p|userprofile}}}}"
-    - "{{Game data/saves|OS X|{{p|osxhome}}}}"
-    - "{{Game data/saves|Linux|{{p|xdgdatahome}}}}"
 Whiskered Away:
   pageId: 100114
   steam: 890930
@@ -241774,10 +241764,11 @@ World of Golf:
   pageId: 51316
   steam: 511560
 World of Goo (2008):
-  malformed: true
   pageId: 167088
   templates:
-    - "{{Game data/config|Windows|{{p|game}}programdata\\2DBOY\\WorldofGoo\\}\n{{Game data/config|OS X|{{p|osxhome}}/Library/Application Support/WorldOfGoo/config.txt}}\n}}"
+    - "{{Game data/config|Windows|{{p|programdata}}\\2DBOY\\WorldofGoo\\}}"
+    - "{{Game data/config|OS X|{{p|osxhome}}/Library/Application Support/WorldOfGoo/config.txt}}"
+    - "{{Game data/saves|OS X|{{p|osxhome}}/Library/Application Support/WorldOfGoo/}}"
 World of Goo (2019):
   cloud:
     steam: true
diff --git a/data/wiki-malformed.md b/data/wiki-malformed.md
index d9b7aa3c..cabfda08 100644
--- a/data/wiki-malformed.md
+++ b/data/wiki-malformed.md
@@ -12,7 +12,6 @@
 * [Street Legal](https://www.pcgamingwiki.com/wiki/?curid=76838)
 * [The Crooked Man](https://www.pcgamingwiki.com/wiki/?curid=78713)
 * [The First Templar](https://www.pcgamingwiki.com/wiki/?curid=40982)
-* [World of Goo (2008)](https://www.pcgamingwiki.com/wiki/?curid=167088)
 * [XIII](https://www.pcgamingwiki.com/wiki/?curid=3514)
 * [ZERO Sievert](https://www.pcgamingwiki.com/wiki/?curid=182762)
 * [Zone of the Enders: The 2nd Runner MARS](https://www.pcgamingwiki.com/wiki/?curid=90671)