diff --git a/data/manifest.yaml b/data/manifest.yaml
index 09706ec2..8ae8aaf6 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -134402,6 +134402,8 @@ Cricket Revolution:
         - save
       when:
         - os: windows
+  steam:
+    id: 2933080
 Crime Cities:
   files:
     "<base>/SETUP.SCR":
@@ -271356,6 +271358,16 @@ H-Rescue:
             store: steam
   steam:
     id: 1058530
+H.E.N.T.A.L.K.E.R.:
+  installDir:
+    HENTALKER: {}
+  launch:
+    "<base>/H.E.N.T.A.L.K.E.R..exe":
+      - when:
+          - os: windows
+            store: steam
+  steam:
+    id: 2927880
 H.I.S.T.O.R.Y T.O.R.C.H.K.A:
   steam:
     id: 521830
@@ -300317,7 +300329,7 @@ Hyperbolica:
         - save
       when:
         - os: linux
-    "<xdgConfig>/unity3d/CodeParade/Hyperbolica/perfs":
+    "<xdgConfig>/unity3d/CodeParade/Hyperbolica/prefs":
       tags:
         - config
       when:
@@ -321087,6 +321099,14 @@ Jetpack Dog:
           - store: steam
   steam:
     id: 880370
+Jetpack Joyride:
+  files:
+    "<winLocalAppData>/Packages/HalfbrickStudiosPtyLtd.JetpackJoyride_w77bc8x1h5kya/LocalState":
+      tags:
+        - config
+        - save
+      when:
+        - os: windows
 Jetpack Porter:
   installDir:
     JETPACK PORTER: {}
@@ -362865,6 +362885,15 @@ M.A.S.S. Builder:
 "M.A.X. 2: Mechanized Assault & Exploration":
   alias: "M.A.X.: Mechanized Assault and Exploration 2"
 "M.A.X.: Mechanized Assault and Exploration":
+  files:
+    "<base>/*.dta":
+      tags:
+        - save
+      when:
+        - os: dos
+        - os: windows
+        - os: mac
+        - os: linux
   gog:
     id: 1207663773
   id:
@@ -362886,6 +362915,13 @@ M.A.S.S. Builder:
   steam:
     id: 615250
 "M.A.X.: Mechanized Assault and Exploration 2":
+  files:
+    "<base>/*.dta":
+      tags:
+        - save
+      when:
+        - os: dos
+        - os: windows
   gog:
     id: 1207663783
   id:
@@ -383996,6 +384032,9 @@ Microsoft Solitaire Collection:
         - config
       when:
         - os: windows
+Microsoft Space Simulator:
+  id:
+    lutris: microsoft-space-simulator
 Microsoft Sudoku:
   files:
     "<winLocalAppData>/Packages/Microsoft.MicrosoftSudoku_8wekyb3d8bbwe/LocalState":
@@ -432143,12 +432182,12 @@ Opus 1 - Social Justice War:
     id: 763570
 Opus Magnum:
   files:
-    "<home>/.local/share/Opus Magnum":
+    "<home>/.local/share/Opus Magnum/<storeUserId>":
       tags:
         - save
       when:
         - os: linux
-    "<home>/.local/share/Opus Magnum/config.cfg":
+    "<home>/.local/share/Opus Magnum/<storeUserId>/config.cfg":
       tags:
         - config
       when:
@@ -436356,6 +436395,11 @@ Outpost 13:
     id: 351060
 "Outpost 2: Divided Destiny":
   files:
+    "<base>/*.op2":
+      tags:
+        - save
+      when:
+        - os: windows
     "<base>/outpost2.ini":
       tags:
         - config
@@ -551480,6 +551524,7 @@ Solo Flight:
     "HKEY_CURRENT_USER/Software/NetmarbleNeo/Solo Leveling:ARISE":
       tags:
         - config
+        - save
   steam:
     id: 2373990
 Solos:
diff --git a/data/missing.md b/data/missing.md
index 97d4648f..29f12c72 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -11113,6 +11113,7 @@
 * [H Chan: Girl](https://www.pcgamingwiki.com/wiki/?curid=136580)
 * [H-Hour: World's Elite](https://www.pcgamingwiki.com/wiki/?curid=47859)
 * [H-Rescue](https://www.pcgamingwiki.com/wiki/?curid=149386)
+* [H.E.N.T.A.L.K.E.R.](https://www.pcgamingwiki.com/wiki/?curid=195163)
 * [H.I.S.T.O.R.Y T.O.R.C.H.K.A](https://www.pcgamingwiki.com/wiki/?curid=63129)
 * [H.I.S.T.O.R.Y T.O.R.C.H.K.A 2](https://www.pcgamingwiki.com/wiki/?curid=81121)
 * [H.U.N.T](https://www.pcgamingwiki.com/wiki/?curid=42135)
@@ -13232,7 +13233,6 @@
 * [Jetlad](https://www.pcgamingwiki.com/wiki/?curid=135492)
 * [JetmanGo](https://www.pcgamingwiki.com/wiki/?curid=72517)
 * [Jetpack Dog](https://www.pcgamingwiki.com/wiki/?curid=98002)
-* [Jetpack Joyride](https://www.pcgamingwiki.com/wiki/?curid=180651)
 * [Jetpack Joyride 2](https://www.pcgamingwiki.com/wiki/?curid=180407)
 * [Jetpack Porter](https://www.pcgamingwiki.com/wiki/?curid=53950)
 * [JetX](https://www.pcgamingwiki.com/wiki/?curid=74147)
@@ -15023,8 +15023,6 @@
 * [M-Plan](https://www.pcgamingwiki.com/wiki/?curid=112548)
 * [M.A.C.S.](https://www.pcgamingwiki.com/wiki/?curid=63568)
 * [M.A.R.S.](https://www.pcgamingwiki.com/wiki/?curid=171389)
-* [M.A.X.: Mechanized Assault and Exploration](https://www.pcgamingwiki.com/wiki/?curid=10696)
-* [M.A.X.: Mechanized Assault and Exploration 2](https://www.pcgamingwiki.com/wiki/?curid=10706)
 * [M.C.I. Escapes](https://www.pcgamingwiki.com/wiki/?curid=127874)
 * [M.E.M.E.S.](https://www.pcgamingwiki.com/wiki/?curid=127327)
 * [M.E.R.C.](https://www.pcgamingwiki.com/wiki/?curid=55213)
@@ -15856,6 +15854,7 @@
 * [Microsoft Pinball Arcade](https://www.pcgamingwiki.com/wiki/?curid=11227)
 * [Microsoft Revenge of Arcade](https://www.pcgamingwiki.com/wiki/?curid=13002)
 * [Microsoft Soccer](https://www.pcgamingwiki.com/wiki/?curid=158234)
+* [Microsoft Space Simulator](https://www.pcgamingwiki.com/wiki/?curid=195165)
 * [MicroSpy](https://www.pcgamingwiki.com/wiki/?curid=65289)
 * [Microtransaction Simulator Game of the Decade: Deluxe Edition](https://www.pcgamingwiki.com/wiki/?curid=88181)
 * [MicroVolts Surge](https://www.pcgamingwiki.com/wiki/?curid=40763)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index b8c0fe79..45af8da2 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -584549,6 +584549,14 @@
       description: Play Polda 5
       executable: Polda5.exe
       type: default
+2927880:
+  installDir: HENTALKER
+  launch:
+    - config:
+        oslist: windows
+      executable: H.E.N.T.A.L.K.E.R..exe
+      type: default
+2933080: {}
 2938840: {}
 2948310: {}
 3221903386: {}
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index fb3b720f..2e9a874e 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -38450,6 +38450,7 @@ Cricket through the Ages:
   pageId: 147749
 "Crime Boss: Rockay City":
   pageId: 183637
+  steam: 2933080
   templates:
     - "{{Game data/config|Windows|{{p|userprofile}}\\Saved Games\\CrimeBoss\\Epic\\Saved\\Config\\WindowsNoEditor}}"
     - "{{Game data/saves|Windows|{{p|userprofile}}\\Saved Games\\CrimeBoss\\Epic\\Saved\\SaveGames}}"
@@ -78010,6 +78011,9 @@ Géants disparus VR:
 H-Rescue:
   pageId: 149386
   steam: 1058530
+H.E.N.T.A.L.K.E.R.:
+  pageId: 195163
+  steam: 2927880
 H.I.S.T.O.R.Y T.O.R.C.H.K.A:
   pageId: 63129
   steam: 521830
@@ -86482,9 +86486,9 @@ Hyperbolica:
     - 1918740
   templates:
     - "{{Game data/config|Windows|{{p|hkcu}}\\Software\\CodeParade\\Hyperbolica\\}}"
-    - "{{Game data/config|Linux|{{p|xdgconfighome}}/unity3d/CodeParade/Hyperbolica/perfs}}"
+    - "{{Game data/config|Linux|{{p|xdgconfighome}}/unity3d/CodeParade/Hyperbolica/prefs}}"
     - "{{Game data/saves|Windows|{{p|userprofile}}\\AppData\\LocalLow\\CodeParade\\Hyperbolica}}"
-    - "{{Game data/saves|Linux|{{p|xdgconfighome}}/unity3d/CodeParade/Hyperbolica/}}"
+    - "{{Game data/saves|Linux|{{p|xdgconfighome}}/unity3d/CodeParade/Hyperbolica}}"
 Hyperborea:
   pageId: 136416
   steam: 983070
@@ -92316,6 +92320,9 @@ Jetpack Dog:
     - 880480
 Jetpack Joyride:
   pageId: 180651
+  templates:
+    - "{{Game data/config|Windows|{{P|localappdata}}\\Packages\\HalfbrickStudiosPtyLtd.JetpackJoyride_w77bc8x1h5kya\\LocalState}}"
+    - "{{Game data/saves|Windows|{{P|localappdata}}\\Packages\\HalfbrickStudiosPtyLtd.JetpackJoyride_w77bc8x1h5kya\\LocalState}}"
 Jetpack Joyride 2:
   pageId: 180407
 Jetpack Porter:
@@ -104328,6 +104335,11 @@ M.A.S.S. Builder:
     - 10
   pageId: 10696
   steam: 615250
+  templates:
+    - "{{Game data/saves|DOS|{{P|game}}\\*.dta}}"
+    - "{{Game data/saves|Windows|{{P|game}}\\*.dta}}"
+    - "{{Game data/saves|OS X|{{P|game}}\\*.dta}}"
+    - "{{Game data/saves|Linux|{{P|game}}\\*.dta}}"
 "M.A.X.: Mechanized Assault and Exploration 2":
   gog: 1207663783
   gogSide:
@@ -104337,6 +104349,9 @@ M.A.S.S. Builder:
     - "M.A.X. 2: Mechanized Assault & Exploration"
     - "M.A.X. 2: Mechanized Assault & Exploration"
   steam: 756810
+  templates:
+    - "{{Game data/saves|DOS|{{P|game}}\\*.dta}}"
+    - "{{Game data/saves|Windows|{{P|game}}\\*.dta}}"
 M.C.I. Escapes:
   pageId: 127874
   steam: 1002500
@@ -110624,6 +110639,9 @@ Microsoft Solitaire Collection:
   templates:
     - "{{Game data/config|Windows|{{P|localappdata}}\\Packages\\Microsoft.MicrosoftSolitaireCollection_8wekyb3d8bbwe\\Settings\\}}"
     - "{{Game data/saves|Windows|{{P|localappdata}}\\Packages\\Microsoft.MicrosoftSolitaireCollection_8wekyb3d8bbwe\\LocalState\\savegame\\}}"
+Microsoft Space Simulator:
+  lutris: microsoft-space-simulator
+  pageId: 195165
 Microsoft Sudoku:
   pageId: 161998
   templates:
@@ -124843,11 +124861,11 @@ Opus Magnum:
     - "{{Game data/config|Windows|{{p|userprofile\\Documents}}\\My Games\\Opus Magnum\\config.cfg|{{p|userprofile\\Documents}}\\My Games\\Opus Magnum\\{{p|uid}}\\config.cfg}}"
     - "{{Game data/config|Microsoft Store|{{p|userprofile\\Documents}}\\My Games\\Opus Magnum\\XboxLiveUser\\config.cfg}}"
     - "{{Game data/config|OS X|{{p|osxhome}}/Library/Application Support/Opus Magnum/{{p|uid}}/config.cfg}}"
-    - "{{Game data/config|Linux|{{p|linuxhome}}/.local/share/Opus Magnum/config.cfg}}"
+    - "{{Game data/config|Linux|{{p|linuxhome}}/.local/share/Opus Magnum/{{p|uid}}/config.cfg}}"
     - "{{Game data/saves|Windows|{{p|userprofile\\Documents}}\\My Games\\Opus Magnum\\|{{p|userprofile\\Documents}}\\My Games\\Opus Magnum\\{{p|uid}}\\}}"
     - "{{Game data/saves|Microsoft Store|{{p|localappdata}}\\Packages\\Zachtronics.OpusMagnum_v98nmcjqt2ht2\\SystemAppData\\}}"
     - "{{Game data/saves|OS X|{{p|osxhome}}/Library/Application Support/Opus Magnum/{{p|uid}}/}}"
-    - "{{Game data/saves|Linux|{{p|linuxhome}}/.local/share/Opus Magnum}}"
+    - "{{Game data/saves|Linux|{{p|linuxhome}}/.local/share/Opus Magnum/{{p|uid}}}}"
 Opus Mortem:
   pageId: 98890
   steam: 887750
@@ -125965,6 +125983,7 @@ Outpost 13:
   pageId: 146547
   templates:
     - "{{Game data/config|Windows|{{P|game}}\\outpost2.ini}}"
+    - "{{Game data/saves|Windows|{{P|game}}\\*.op2}}"
 Outpost Delta:
   pageId: 150631
   steam: 1099090
@@ -159089,7 +159108,7 @@ Solo:
   steam: 2373990
   templates:
     - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\NetmarbleNeo\\Solo Leveling:ARISE}}"
-    - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\NetmarbleNeo\\Solo Leveling:ARISE}}"
+    - "{{Game data/saves|Windows|{{P|hkcu}}\\Software\\NetmarbleNeo\\Solo Leveling:ARISE}}"
 Solos:
   pageId: 88908
   steam: 809060
@@ -166171,6 +166190,7 @@ Step by Step:
 StepMania:
   pageId: 168142
   templates:
+    - "{{Game data/config|Windows|<path-to-game>\\StepMania 5\\Themes\\_fallback}}"
     - "{{Game data/saves|Windows|<path-to-game>\\StepMania 5\\Data}}"
 StepX:
   pageId: 71780