diff --git a/data/manifest.yaml b/data/manifest.yaml
index ab4af0a3..212f2973 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -54169,7 +54169,7 @@ Avatar of the Wolf:
     AFOP: {}
   launch:
     "<base>/afop.exe":
-      - arguments: "-uplay_steam_mode -uplay_launcher"
+      - arguments: "-uplay_steam_mode -uplay_launcher -livefix"
         when:
           - store: steam
   steam:
@@ -219264,6 +219264,7 @@ Escape Simulator:
       - 2175260
       - 2419810
       - 2644870
+      - 2644890
       - 2843390
       - 2879620
       - 3193660
@@ -219288,6 +219289,11 @@ Escape Simulator:
         - config
   steam:
     id: 1435790
+Escape Simulator 2:
+  cloud:
+    steam: true
+  steam:
+    id: 2879840
 Escape Station:
   installDir:
     Escape Station: {}
@@ -527823,6 +527829,12 @@ Retrowave:
   steam:
     id: 1239690
 Retrowave 2:
+  installDir:
+    Retrowave 2: {}
+  launch:
+    "<base>/Retrowave 2.exe":
+      - when:
+          - store: steam
   steam:
     id: 3331000
 Retrowave World:
@@ -534151,9 +534163,16 @@ River City Girls Zero:
   cloud:
     steam: true
   files:
-    "<home>/Saved Games/Way Forward/River City Girls Zero":
+    "<home>/Saved Games/Way Forward/River City Girls Zero/0/*/*.*":
+      tags:
+        - config
       when:
-        - store: steam
+        - os: windows
+    "<home>/Saved Games/Way Forward/River City Girls Zero/carbon.cfg":
+      tags:
+        - config
+      when:
+        - os: windows
   installDir:
     River City Girls Zero: {}
   launch:
diff --git a/data/missing.md b/data/missing.md
index 32289418..d493ec83 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -8502,6 +8502,7 @@
 * [Escape Room Simulator](https://www.pcgamingwiki.com/wiki/?curid=145570)
 * [Escape Room VR](https://www.pcgamingwiki.com/wiki/?curid=155923)
 * [Escape Room VR: Stories](https://www.pcgamingwiki.com/wiki/?curid=87023)
+* [Escape Simulator 2](https://www.pcgamingwiki.com/wiki/?curid=199961)
 * [Escape Station](https://www.pcgamingwiki.com/wiki/?curid=40424)
 * [Escape the Ayuwoki](https://www.pcgamingwiki.com/wiki/?curid=152979)
 * [Escape the Bunker](https://www.pcgamingwiki.com/wiki/?curid=55177)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index 237c084b..62c9daa3 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -585966,7 +585966,7 @@
       type: default
       workingdir: "client_pc\\root\\bin\\pc"
     - config:
-        betakey: "focus_marketing_recording, steam_features"
+        betakey: "focus_marketing_recording, steam_features, fe_hw_nvidia_temp"
         oslist: windows
       description: SteamRetail
       executable: "client_pc\\root\\bin\\pc\\MagnusClientSteamRetail.exe"
@@ -585985,14 +585985,14 @@
       executable: "client_pc\\root\\bin\\pc\\MagnusEosBootstrapperRelease.exe"
       workingdir: "client_pc\\root\\bin\\pc\\"
     - config:
-        betakey: "focus_test_dev, steam_features, natour,  test_backend,test_pros_true_retail, saber_external_preview, fe_crossplay, fe_hw_nvidia_temp, steam_dev_live, test_steam_dev, test_prod_dev, patch_steam_dev"
+        betakey: "focus_test_dev, steam_features, natour,  test_backend,test_pros_true_retail, saber_external_preview, fe_crossplay, steam_dev_live, test_steam_dev, test_prod_dev, patch_steam_dev"
         oslist: windows
       description: Space Marine 2 Retail EOS noEAC
       executable: "client_pc\\root\\bin\\pc\\MagnusEosBootstrapperRetail.exe"
       workingdir: "client_pc\\root\\bin\\pc\\"
     - arguments: "--set \"/Config/Permissions/enablePermissionAntiCheat\" permit"
       config:
-        betakey: "focus_test_dev, steam_features, test_backend, test_pros_true_retail, saber_external_preview, fe_crossplay, fe_hw_nvidia_temp, steam_dev_live, test_steam_dev,  test_prod_dev, patch_steam_dev"
+        betakey: "focus_test_dev, steam_features, test_backend, test_pros_true_retail, saber_external_preview, fe_crossplay, steam_dev_live, test_steam_dev,  test_prod_dev, patch_steam_dev"
         oslist: windows
       description: Space Marine 2 Profile EOS noEAC
       executable: "client_pc\\root\\bin\\pc\\MagnusEosBootstrapperProfile.exe"
@@ -586015,7 +586015,7 @@
       executable: Warhammer 40000 Space Marine 2.exe
       workingdir: "client_pc\\root\\bin\\pc"
     - config:
-        betakey: "focus_marketing_recording, focus_playtest, ms_builds"
+        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp"
         oslist: windows
       description: Profile Launcher
       executable: launcher_pc_profile.bat
@@ -586075,26 +586075,26 @@
       executable: "Artbook\\open.bat"
       type: option1
     - config:
-        betakey: focus_marketing_recording
+        betakey: "focus_marketing_recording, fe_hw_nvidia_temp"
         oslist: windows
       description: Release
       executable: "client_pc\\root\\bin\\pc\\MagnusClientRelease.exe"
       type: option2
       workingdir: "client_pc\\root\\bin\\pc"
     - config:
-        betakey: focus_marketing_recording
+        betakey: "focus_marketing_recording, fe_hw_nvidia_temp"
         oslist: windows
       description: Retail
       executable: "client_pc\\root\\bin\\pc\\MagnusClientRetail.exe"
       type: option3
       workingdir: "client_pc\\root\\bin\\pc"
     - config:
-        betakey: "focus_marketing_recording, focus_playtest, ms_builds"
+        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp"
         oslist: windows
       description: Release Launcher
       executable: launcher_pc_release.bat
     - config:
-        betakey: "focus_marketing_recording, focus_playtest, ms_builds"
+        betakey: "focus_marketing_recording, focus_playtest, ms_builds, fe_hw_nvidia_temp"
         oslist: windows
       description: Retail Launcher
       executable: launcher_pc_retail.bat
@@ -586105,7 +586105,7 @@
       executable: "client_pc\\root\\bin\\pc\\Warhammer 40,000 Space Marine 2.exe"
       workingdir: "client_pc\\root\\bin\\pc"
     - config:
-        betakey: "focus_marketing_recording, steam_features"
+        betakey: "focus_marketing_recording, steam_features, fe_hw_nvidia_temp"
         oslist: windows
       description: SteamRelease
       executable: "client_pc\\root\\bin\\pc\\MagnusClientSteamRelease.exe"
@@ -598208,7 +598208,7 @@
 2840770:
   installDir: AFOP
   launch:
-    - arguments: "-uplay_steam_mode -uplay_launcher"
+    - arguments: "-uplay_steam_mode -uplay_launcher -livefix"
       description: PROD
       executable: afop.exe
 2842040:
@@ -598417,6 +598417,7 @@
   nameLocalized:
     schinese: NBA 2K25
     tchinese: NBA 2K25
+2879840: {}
 2881650:
   cloud:
     saves:
@@ -599886,7 +599887,10 @@
 3319590: {}
 3320880: {}
 3324100: {}
-3331000: {}
+3331000:
+  installDir: Retrowave 2
+  launch:
+    - executable: Retrowave 2.exe
 3340810:
   installDir: Hero of the Kingdom The Lost Tales 3
   launch:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 9956b81e..1d882353 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -69184,12 +69184,18 @@ Escape Simulator:
     - 2175260
     - 2419810
     - 2644870
+    - 2644890
     - 2843390
     - 2879620
     - 3193660
   templates:
     - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\Pine Studio\\Escape Simulator\\}}"
     - "{{Game data/saves|Windows|{{P|userprofile}}\\AppData\\LocalLow\\Pine Studio\\Escape Simulator\\EscapeSimulator-*.sav}}"
+Escape Simulator 2:
+  cloud:
+    steam: true
+  pageId: 199961
+  steam: 2879840
 Escape Station:
   pageId: 40424
   steam: 527360
@@ -170174,6 +170180,9 @@ River City Girls Zero:
     steam: true
   pageId: 177550
   steam: 1851020
+  templates:
+    - "{{Game data/config|Windows|{{p|USERPROFILE}}\\Saved Games\\Way Forward\\River City Girls Zero\\carbon.cfg}}"
+    - "{{Game data/config|Windows|{{p|USERPROFILE}}\\Saved Games\\Way Forward\\River City Girls Zero\\0\\*\\*.*}}"
 River City Melee Mach!!:
   pageId: 149043
   steam: 763710