diff --git a/data/manifest.yaml b/data/manifest.yaml
index 548148cd..2ac05a4c 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -74762,15 +74762,15 @@ BioShock 2 Remastered:
   installDir:
     BioShock 2 Remastered: {}
   launch:
-    "<base>/2KLauncher/LauncherPatcher.exe":
-      - when:
-          - os: windows
-            store: steam
-        workingDir: "<base>/Build/Final"
     "<base>/BioShock 2 Remastered.app":
       - when:
           - os: mac
             store: steam
+    "<base>/Build/Final/Bioshock2HD.exe":
+      - when:
+          - os: windows
+            store: steam
+        workingDir: "<base>/Build/Final"
   steam:
     id: 409720
 BioShock Infinite:
@@ -269011,6 +269011,43 @@ GeometryPuzzler:
 "George's Memories EP.1":
   steam:
     id: 894050
+Georgie-Yolkie:
+  cloud:
+    steam: true
+  files:
+    "<home>/AppData/LocalLow/Spacefarer Games Ltd/Georgie-Yolkie":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<root>/userdata/<storeUserId>/3241020/remote":
+      tags:
+        - save
+      when:
+        - store: steam
+  installDir:
+    Georgie-Yolkie: {}
+  launch:
+    "<base>/GY_VideoSettings.exe":
+      - when:
+          - bit: 64
+            os: windows
+            store: steam
+    "<base>/Georgie-Yolkie.exe":
+      - when:
+          - bit: 64
+            store: steam
+    "<base>/Tech_Support/Spacefarer Tech Support.exe":
+      - when:
+          - bit: 64
+            os: windows
+            store: steam
+  registry:
+    HKEY_CURRENT_USER/SOFTWARE/Spacefarer Games Ltd/Georgie-Yolkie:
+      tags:
+        - config
+  steam:
+    id: 3241020
 Georifters:
   files:
     "<winLocalAppData>/Georifters/Saved/SaveGames/*.sav":
@@ -389658,7 +389695,7 @@ Mafia II:
   installDir:
     Mafia II Definitive Edition: {}
   launch:
-    "<base>/2KLauncher/LauncherPatcher.exe":
+    "<base>/pc/Mafia II Definitive Edition.exe":
       - when:
           - bit: 64
             os: windows
@@ -389709,15 +389746,15 @@ Mafia III:
   installDir:
     Mafia III: {}
   launch:
-    "<base>/2KLauncher/LauncherPatcher.exe":
-      - when:
-          - bit: 64
-            os: windows
-            store: steam
     "<base>/Mafia3.app":
       - when:
           - os: mac
             store: steam
+    "<base>/mafia3definitiveedition.exe":
+      - when:
+          - bit: 64
+            os: windows
+            store: steam
   steam:
     id: 360430
 "Mafia: Definitive Edition":
@@ -389751,7 +389788,7 @@ Mafia III:
   installDir:
     Mafia Definitive Edition: {}
   launch:
-    "<base>/2KLauncher/LauncherPatcher.exe":
+    "<base>/mafiadefinitiveedition.exe":
       - when:
           - bit: 64
             os: windows
@@ -447915,7 +447952,7 @@ Noobs Want to Live:
   cloud:
     steam: true
   files:
-    "<home>/AppData/LocalLow/GD Studio/Noobs Want To Live/SaveFile.es3":
+    "<home>/AppData/LocalLow/GD Studio/Noobs Want To Live":
       tags:
         - config
         - save
@@ -572046,12 +572083,6 @@ Sickness:
       - when:
           - os: mac
             store: steam
-    "<base>/LaunchPad/LaunchPad.exe":
-      - when:
-          - bit: 64
-            os: windows
-            store: steam
-        workingDir: "<base>/LaunchPad"
   steam:
     id: 8930
 "Sid Meier's Civilization VI":
@@ -679580,6 +679611,10 @@ The Quarry:
       - 2101870
   installDir:
     The Quarry: {}
+  launch:
+    "<base>/TheQuarry.exe":
+      - when:
+          - store: steam
   steam:
     id: 1577120
 The Quarter Game:
@@ -768540,12 +768575,6 @@ XCOM 2:
   installDir:
     XCOM 2: {}
   launch:
-    "<base>/2KLauncher/LauncherPatcher.exe":
-      - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
-        when:
-          - bit: 64
-            os: windows
-            store: steam
     "<base>/XCOM 2.app":
       - when:
           - bit: 64
@@ -768556,6 +768585,19 @@ XCOM 2:
           - bit: 64
             os: linux
             store: steam
+    "<base>/binaries/Win64/XCom2.exe":
+      - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
+        when:
+          - bit: 64
+            os: windows
+            store: steam
+    "<base>/launcher/launcher.exe":
+      - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
+        when:
+          - bit: 64
+            os: windows
+            store: steam
+        workingDir: "<base>/launcher"
   steam:
     id: 268500
 "XCOM: Chimera Squad":
@@ -768578,12 +768620,19 @@ XCOM 2:
   installDir:
     XCOM-Chimera-Squad: {}
   launch:
-    "<base>/2KLauncher/LauncherPatcher.exe":
+    "<base>/Launcher/launcher.exe":
       - arguments: "-steam_auto_login -game-50546=-crashdumpwatcher -game-50546=-review -game-50546=-noRedscreens"
         when:
           - bit: 64
+            os: windows
             store: steam
         workingDir: "<base>/Launcher"
+    "<base>/binaries/Win64/XCom.exe":
+      - arguments: "-steam_auto_login -game-50546=-crashdumpwatcher -game-50546=-review -game-50546=-noRedscreens"
+        when:
+          - bit: 64
+            os: windows
+            store: steam
   steam:
     id: 882100
 "XCOM: Enemy Unknown":
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index de549ca5..6e991817 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -3683,6 +3683,7 @@
       description: Launch
       executable: "./Civ5XP"
     - config:
+        betakey: newtest
         osarch: "64"
         oslist: windows
       executable: LaunchPad/LaunchPad.exe
@@ -3697,21 +3698,18 @@
       executable: LaunchPad/LaunchPad.exe
       workingdir: LaunchPad
     - config:
-        betakey: newtest
         osarch: "64"
         oslist: windows
       description: Sid Meier’s Civilization V (DirectX 9)
       executable: CivilizationV.exe
       type: option1
     - config:
-        betakey: newtest
         osarch: "64"
         oslist: windows
       description: Sid Meier’s Civilization V (DirectX 10/11)
       executable: CivilizationV_DX11.exe
       type: option2
     - config:
-        betakey: newtest
         osarch: "64"
         oslist: windows
       description: Sid Meier’s Civilization V (Touch)
@@ -41259,27 +41257,12 @@
       type: none
     - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
       config:
+        betakey: newtest
         osarch: "64"
         oslist: windows
       description: XCOM 2 - 2K Launcher
       executable: "2KLauncher\\LauncherPatcher.exe"
       type: default
-    - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
-      config:
-        betakey: "old,newtest"
-        osarch: "64"
-        oslist: windows
-      description: Open New Mod Launcher
-      executable: "launcher\\launcher.exe"
-      workingdir: launcher
-    - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
-      config:
-        betakey: newtest
-        osarch: "64"
-        oslist: windows
-        ownsdlc: "593380"
-      description: Open Original Mod Launcher
-      executable: "binaries\\Win64\\launcher\\ModLauncherWPF.exe"
     - arguments: "-noRedScreens -review"
       config:
         betakey: 2k_marketing
@@ -41291,7 +41274,6 @@
       type: none
     - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
       config:
-        betakey: newtest
         osarch: "64"
         oslist: windows
       description: XCOM 2 Base Game
@@ -41299,13 +41281,26 @@
       type: default
     - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
       config:
-        betakey: newtest
         osarch: "64"
         oslist: windows
         ownsdlc: "593380"
       description: War of the Chosen
       executable: "\\XCom2-WarOfTheChosen\\Binaries\\Win64\\XCom2.exe"
       type: option3
+    - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
+      config:
+        osarch: "64"
+        oslist: windows
+      description: Open New Mod Launcher
+      executable: "launcher\\launcher.exe"
+      workingdir: launcher
+    - arguments: "-steam_auto_login -game-61483=-review -game-61483=-noRedscreens"
+      config:
+        osarch: "64"
+        oslist: windows
+        ownsdlc: "593380"
+      description: Open Original Mod Launcher
+      executable: "binaries\\Win64\\launcher\\ModLauncherWPF.exe"
     - config:
         osarch: "64"
         oslist: linux
@@ -96229,7 +96224,6 @@
   installDir: Mafia III
   launch:
     - config:
-        betakey: "sanitycheck,newtest"
         osarch: "64"
         oslist: windows
       executable: mafia3definitiveedition.exe
@@ -96239,13 +96233,13 @@
       executable: Mafia3.app
       type: none
     - config:
-        betakey: "legacy,newtest"
         osarch: "64"
         oslist: windows
       description: Mafia III Definitive Edition Launcher
       executable: launcher.exe
       type: option2
     - config:
+        betakey: newtest
         osarch: "64"
         oslist: windows
       description: 2K Launcher
@@ -130002,7 +129996,6 @@
   installDir: BioShock 2 Remastered
   launch:
     - config:
-        betakey: "qatest1,newtest"
         oslist: windows
       executable: "Build\\Final\\Bioshock2HD.exe"
       type: default
@@ -130043,6 +130036,7 @@
       executable: "2KLauncher\\LauncherPatcher.exe"
       workingdir: "Build\\Final"
     - config:
+        betakey: newtest
         oslist: windows
       description: Launch With 2KLauncher
       executable: "2KLauncher\\LauncherPatcher.exe"
@@ -377307,6 +377301,19 @@
       description: Release
       executable: "Dio\\binaries\\Win64\\XCom2.exe"
       type: option1
+    - arguments: "-steam_auto_login -game-50546=-crashdumpwatcher -game-50546=-review -game-50546=-noRedscreens"
+      config:
+        osarch: "64"
+        oslist: windows
+      executable: "binaries\\Win64\\XCom.exe"
+      type: default
+    - arguments: "-steam_auto_login -game-50546=-crashdumpwatcher -game-50546=-review -game-50546=-noRedscreens"
+      config:
+        osarch: "64"
+        oslist: windows
+      description: Open Mod Launcher
+      executable: "Launcher\\launcher.exe"
+      workingdir: Launcher
     - arguments: "-crashdumpwatcher -review -noRedscreens"
       config:
         betakey: "firaxis_qa, firaxis_qa_alt, qa_alt, review, ihv_review, firaxis_review, age_ratings"
@@ -377328,20 +377335,11 @@
         betakey: "firaxis_qa, external_review, qa_b, qa_c, xsolla"
         osarch: "64"
         oslist: windows
-      description: Dio
       executable: "Launcher\\launcher.exe"
-      type: option3
-      workingdir: Launcher
-    - arguments: "-steam_auto_login -game-50546=-crashdumpwatcher -game-50546=-review -game-50546=-noRedscreens"
-      config:
-        betakey: old
-        osarch: "64"
-        oslist: windows
-      executable: "Launcher\\launcher.exe"
-      type: default
       workingdir: Launcher
     - arguments: "-steam_auto_login -game-50546=-crashdumpwatcher -game-50546=-review -game-50546=-noRedscreens"
       config:
+        betakey: newtest
         osarch: "64"
       description: 2K Launcher
       executable: "2KLauncher\\LauncherPatcher.exe"
@@ -443645,14 +443643,12 @@
   installDir: Mafia II Definitive Edition
   launch:
     - config:
-        betakey: "capture_tools,newtest"
         osarch: "64"
         oslist: windows
       executable: pc/Mafia II Definitive Edition.exe
       type: default
       workingdir: pc
     - config:
-        betakey: "old,newtest"
         osarch: "64"
         oslist: windows
       description: Mafia II Definitive Edition Launcher
@@ -443660,6 +443656,7 @@
       type: option2
       workingdir: "pc\\Mafia2Launcher"
     - config:
+        betakey: newtest
         osarch: "64"
         oslist: windows
       description: 2K Launcher
@@ -443698,7 +443695,6 @@
       executable: launcher.exe
       type: none
     - config:
-        betakey: "previewcode2,newtest"
         osarch: "64"
         oslist: windows
       executable: mafiadefinitiveedition.exe
@@ -443712,8 +443708,6 @@
       executable: launcher.exe
       type: none
     - arguments: /steam /cloudSave
-      config:
-        betakey: "post_release_update,newtest"
       description: "Mafia: Definitive Edition Launcher"
       executable: launcher.exe
       type: option1
@@ -443730,6 +443724,7 @@
       executable: launcher.exe
       type: none
     - config:
+        betakey: newtest
         osarch: "64"
         oslist: windows
       description: Launcher Patcher
@@ -556078,12 +556073,12 @@
 1577120:
   installDir: The Quarry
   launch:
-    - description: Launch with 2KLauncher
+    - config:
+        betakey: newtest
+      description: Launch with 2KLauncher
       executable: "2KLauncher\\LauncherPatcher.exe"
       type: option1
-    - config:
-        betakey: "2kqa_a,2kqa_b,2k_marketing,newtest"
-      executable: TheQuarry.exe
+    - executable: TheQuarry.exe
       type: default
   nameLocalized:
     japanese: クアリー～悪夢のサマーキャンプ
@@ -598852,6 +598847,35 @@
         oslist: windows
       executable: Rocky Horror.exe
       type: default
+3241020:
+  cloud:
+    saves:
+      - path: Tech_Support/SaveSlotsBackup
+        pattern: "*.data"
+        root: gameinstall
+      - path: ""
+        pattern: "*.dat"
+        root: gameinstall
+      - path: Spacefarer Games Ltd/Georgie-Yolkie
+        pattern: "*.*"
+        recursive: true
+        root: WinAppDataLocalLow
+  installDir: Georgie-Yolkie
+  launch:
+    - config:
+        osarch: "64"
+      executable: Georgie-Yolkie.exe
+      type: default
+    - config:
+        osarch: "64"
+        oslist: windows
+      description: Change video settings
+      executable: GY_VideoSettings.exe
+    - config:
+        osarch: "64"
+        oslist: windows
+      description: Technical Support
+      executable: Tech_Support/Spacefarer Tech Support.exe
 3243190:
   cloud:
     saves:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 606723c9..456c847f 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -85242,6 +85242,15 @@ GeometryPuzzler:
 "George's Memories EP.1":
   pageId: 103137
   steam: 894050
+Georgie-Yolkie:
+  cloud:
+    steam: true
+  pageId: 199613
+  steam: 3241020
+  templates:
+    - "{{Game data/config|Windows|{{p|hkcu}}\\SOFTWARE\\Spacefarer Games Ltd\\Georgie-Yolkie\\}}"
+    - "{{Game data/saves|Windows|{{p|userprofile}}\\AppData\\LocalLow\\Spacefarer Games Ltd\\Georgie-Yolkie\\}}"
+    - "{{Game data/saves|Steam|{{p|steam}}/userdata/{{p|uid}}/3241020/remote/}}"
 Georifters:
   pageId: 139503
   steam: 1080490
@@ -142652,8 +142661,8 @@ Noobs Want to Live:
   pageId: 199588
   steam: 1737340
   templates:
-    - "{{Game data/config|Windows|{{P|userprofile\\appdata\\locallow}}\\GD Studio\\Noobs Want To Live\\SaveFile.es3}}"
-    - "{{Game data/saves|Windows|{{P|userprofile\\appdata\\locallow}}\\GD Studio\\Noobs Want To Live\\SaveFile.es3}}"
+    - "{{Game data/config|Windows|{{P|userprofile\\appdata\\locallow}}\\GD Studio\\Noobs Want To Live\\}}"
+    - "{{Game data/saves|Windows|{{P|userprofile\\appdata\\locallow}}\\GD Studio\\Noobs Want To Live\\}}"
 Noodle Jump:
   pageId: 134564
   steam: 1050660