diff --git a/data/manifest.yaml b/data/manifest.yaml
index 37c16b39..eb72764f 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -25657,7 +25657,7 @@ Ales Dash:
         - os: dos
 Alex Builds His Farm:
   files:
-    "<base>/Gamedata/SaveGame":
+    "<base>/GameData/SaveGame":
       tags:
         - save
       when:
@@ -90339,6 +90339,8 @@ Brotherhood United:
   steam:
     id: 869030
 "Brothers in Arms: Earned in Blood":
+  cloud:
+    gog: true
   files:
     "<winAppData>/Gearbox Software/Earned In Blood/<storeUserId>":
       tags:
@@ -167295,6 +167297,8 @@ DiRT 4:
   steam:
     id: 421020
 DiRT Rally:
+  cloud:
+    steam: true
   files:
     "<base>/Profile/Player/Saves":
       tags:
@@ -167336,6 +167340,8 @@ DiRT Rally:
   steam:
     id: 310560
 DiRT Rally 2.0:
+  cloud:
+    steam: true
   files:
     "<root>/userdata/<storeUserId>/690790/remote":
       tags:
@@ -176667,6 +176673,8 @@ Doom 64 EX:
 Doom Classic:
   alias: Doom I Enhanced
 Doom Eternal:
+  cloud:
+    steam: true
   files:
     "<home>/Saved Games/id Software/DOOMEternal/base":
       tags:
@@ -214653,6 +214661,8 @@ F1 2020:
   steam:
     id: 1080110
 F1 2021:
+  cloud:
+    steam: true
   installDir:
     F1 2021: {}
   steam:
@@ -214815,6 +214825,8 @@ F1 Manager 2023:
   steam:
     id: 2287220
 F1 Race Stars:
+  cloud:
+    steam: true
   files:
     "<root>/userdata/<storeUserId>/203680/local/hardwareconfig":
       tags:
@@ -246342,6 +246354,8 @@ GRID (2019):
   steam:
     id: 703860
 GRID 2:
+  cloud:
+    steam: true
   files:
     "<root>/userdata/<storeUserId>/44350/remote":
       tags:
@@ -246435,6 +246449,9 @@ GRID Autosport:
   steam:
     id: 255220
 GRID Legends:
+  cloud:
+    origin: true
+    steam: true
   files:
     "<winDocuments>/My Games/GRID Legends/hardwaresettings/hardware_settings_config.xml":
       tags:
@@ -280354,6 +280371,8 @@ Hearts of Iron III:
   steam:
     id: 25890
 Hearts of Iron IV:
+  cloud:
+    steam: true
   files:
     "<home>/Paradox Interactive/Hearts of Iron IV":
       tags:
@@ -300496,7 +300515,7 @@ Hypatia:
     id: 401970
 "Hype: The Time Quest":
   files:
-    "<base>/Gamedata/SaveGame":
+    "<base>/GameData/SaveGame":
       tags:
         - save
       when:
@@ -312835,6 +312854,11 @@ Inscryption:
   cloud:
     steam: true
   files:
+    "<base>/Inscryption.App/SaveFile.gwsave":
+      tags:
+        - save
+      when:
+        - os: mac
     "<base>/SaveFile.gwsave":
       tags:
         - save
@@ -343261,7 +343285,7 @@ Launch Squad:
     id: 523860
 "Laura's Happy Adventures":
   files:
-    "<base>/Gamedata/SaveGame":
+    "<base>/GameData/SaveGame":
       tags:
         - save
       when:
@@ -463597,6 +463621,9 @@ Potentia:
   steam:
     id: 652530
 Potion Craft:
+  cloud:
+    gog: true
+    steam: true
   files:
     "<home>/AppData/LocalLow/niceplay games/Potion Craft/SavesSteam":
       tags:
@@ -472143,14 +472170,18 @@ Psychonauts:
   steam:
     id: 3830
 Psychonauts 2:
+  cloud:
+    gog: true
+    steam: true
   files:
     "<home>/.config/Epic/Psychonauts2":
       tags:
         - save
       when:
         - os: linux
-    "<home>/Library/Containers/com.doublefine.psychonauts2/Data/Library/Application Support/Epic/Psychonauts2/Saved":
+    "<home>/Library/Application Support/Epic/Psychonauts2/Saved/SaveGames":
       tags:
+        - config
         - save
       when:
         - os: mac
@@ -473995,10 +474026,19 @@ Putt-Putt Joins the Parade:
   steam:
     id: 283920
 Putt-Putt Saves the Zoo:
+  cloud:
+    steam: true
   files:
-    "<base>/Saves/*.*":
+    "<base>/Saves":
+      tags:
+        - save
       when:
-        - store: steam
+        - os: windows
+    "<base>/ScummVM_Windows":
+      tags:
+        - config
+      when:
+        - os: windows
   installDir:
     Putt-Putt Saves The Zoo: {}
   launch:
@@ -485904,6 +485944,8 @@ Rayman:
         - os: windows
   gog:
     id: 1207658940
+  id:
+    lutris: rayman-2-the-great-escape
   installDir:
     Rayman 2 - The Great Escape: {}
   launch:
@@ -535399,10 +535441,14 @@ Shock Tactics:
   steam:
     id: 473610
 Shock Troopers:
+  cloud:
+    gog: true
+    steam: true
   files:
     "<winLocalAppData>/shocktro":
       tags:
         - config
+        - save
       when:
         - os: windows
   gog:
@@ -569820,6 +569866,8 @@ Star Trek Timelines:
   steam:
     id: 359650
 "Star Trek: Armada":
+  cloud:
+    gog: true
   files:
     "<base>/ARMADA.PRF":
       tags:
@@ -573950,6 +573998,20 @@ Starsphere:
             store: steam
   steam:
     id: 408750
+Starstream:
+  files:
+    "<base>/Saves":
+      tags:
+        - save
+      when:
+        - os: windows
+    N/A:
+      tags:
+        - config
+      when:
+        - os: windows
+  steam:
+    id: 2989400
 Starstruck:
   steam:
     id: 1054950
diff --git a/data/missing.md b/data/missing.md
index 30ae36cf..958c128d 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -16421,6 +16421,7 @@
 * [Mortal Kombat Trilogy](https://www.pcgamingwiki.com/wiki/?curid=8460)
 * [Mortal Manor](https://www.pcgamingwiki.com/wiki/?curid=79290)
 * [Mortal Royale](https://www.pcgamingwiki.com/wiki/?curid=110146)
+* [Mortal Sin](https://www.pcgamingwiki.com/wiki/?curid=195390)
 * [Mortar and Pestle](https://www.pcgamingwiki.com/wiki/?curid=82732)
 * [Mortar Howl](https://www.pcgamingwiki.com/wiki/?curid=103011)
 * [Mortars VR](https://www.pcgamingwiki.com/wiki/?curid=78226)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index 5dcf934c..765a5aea 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -585363,4 +585363,5 @@
 2938840: {}
 2948310: {}
 2949240: {}
+2989400: {}
 3221903386: {}
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 6c2f3b30..af651a22 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -7273,7 +7273,7 @@ Alex Builds His Farm:
   pageId: 88449
   templates:
     - "{{Game data/config|Windows|{{p|windir}}\\UbiSoft\\ubi.ini}}"
-    - "{{Game data/saves|Windows|{{p|game}}\\Gamedata\\SaveGame}}"
+    - "{{Game data/saves|Windows|{{p|game}}\\GameData\\SaveGame}}"
 "Alex Hunter: Lord of the Mind":
   pageId: 40503
   steam: 1120800
@@ -26088,6 +26088,8 @@ Brotherhood United:
   pageId: 96545
   steam: 869030
 "Brothers in Arms: Earned in Blood":
+  cloud:
+    gog: true
   gog: 1239584357
   lutris: brothers-in-arms-earned-in-blood
   pageId: 11187
@@ -48107,6 +48109,8 @@ DiRT 4:
     - "{{Game data/saves|Windows|{{p|steam}}\\userdata\\{{p|uid}}\\421020\\}}"
     - "{{Game data/saves|Linux|{{p|steam}}/userdata/{{p|uid}}/421020/}}"
 DiRT Rally:
+  cloud:
+    steam: true
   lutris: dirt-rally
   pageId: 24503
   steam: 310560
@@ -48116,6 +48120,9 @@ DiRT Rally:
     - "{{Game data/saves|Windows|{{p|game}}\\Profile\\Player\\Saves}}"
     - "{{Game data/saves|Steam|{{p|steam}}\\userdata\\{{p|uid}}\\310560\\}}"
 DiRT Rally 2.0:
+  cloud:
+    steam: true
+    xbox: true
   pageId: 111768
   steam: 690790
   templates:
@@ -50843,6 +50850,9 @@ Doom 64 EX:
     - "{{Game data/config|Windows|{{P|game}}\\config.cfg}}"
     - "{{Game data/saves|Windows|{{P|game}}\\doomsav*.dsg}}"
 Doom Eternal:
+  cloud:
+    steam: true
+    xbox: true
   lutris: doom-eternal
   pageId: 97499
   steam: 782330
@@ -61842,6 +61852,8 @@ F1 2020:
     - "{{Game data/config|Windows|{{p|userprofile\\Documents}}\\My Games\\F1 2020\\hardwaresettings\\hardware_settings_config.xml}}"
     - "{{Game data/saves|Windows|{{p|steam}}/userdata/{{p|uid}}/1080110/remote/}}"
 F1 2021:
+  cloud:
+    steam: true
   pageId: 167918
   steam: 1134570
 F1 22:
@@ -61900,6 +61912,8 @@ F1 Manager 2023:
     - "{{Game data/config|Windows|{{p|localappdata}}\\F1Manager23\\Saved\\Config\\WindowsNoEditor\\}}"
     - "{{Game data/saves|Windows|{{p|localappdata}}\\F1Manager23\\Saved\\SaveGames\\|{{p|game}}\\F1Manager23\\Saved\\SaveGames\\}}"
 F1 Race Stars:
+  cloud:
+    steam: true
   pageId: 30072
   steam: 203680
   templates:
@@ -71170,6 +71184,8 @@ GRID (2019):
     - "{{Game data/config|Windows|{{P|userprofile\\Documents}}\\My Games\\GRID (2019)\\hardwaresettings\\hardware_settings_config.xml}}"
     - "{{Game data/saves|Steam|{{p|steam}}/userdata/{{p|uid}}/703860/remote/savegame}}"
 GRID 2:
+  cloud:
+    steam: true
   lutris: grid-2
   pageId: 4589
   steam: 44350
@@ -71200,6 +71216,9 @@ GRID Autosport:
     - "{{Game data/config|Linux|{{p|xdgdatahome}}/feral-interactive/GRID Autosport/preferences|{{p|xdgdatahome}}/feral-interactive/GRID Autosport/VFS/User/AppData/Roaming/My Games/GRID Autosport/hardwaresettings/}}"
     - "{{Game data/saves|Steam|{{p|steam}}/userdata/{{p|uid}}/255220/remote/}}"
 GRID Legends:
+  cloud:
+    origin: true
+    steam: true
   pageId: 170246
   steam: 1307710
   templates:
@@ -81146,6 +81165,8 @@ Hearts of Iron III:
     - "{{Game data/config|Windows|{{p|game}}\\settings.txt}}"
     - "{{Game data/saves|Windows|{{p|game}}\\save games\\}}"
 Hearts of Iron IV:
+  cloud:
+    steam: true
   lutris: hearts-of-iron-iv
   pageId: 32746
   steam: 394360
@@ -86987,7 +87008,7 @@ Hypatia:
   pageId: 1680
   templates:
     - "{{Game data/config|Windows|{{p|windir}}\\UbiSoft\\ubi.ini}}"
-    - "{{Game data/saves|Windows|{{p|game}}\\Gamedata\\SaveGame}}"
+    - "{{Game data/saves|Windows|{{p|game}}\\GameData\\SaveGame}}"
 Hyper Arena VR:
   pageId: 81735
   steam: 780400
@@ -90451,6 +90472,7 @@ Inscryption:
     - 1753260
   templates:
     - "{{Game data/saves|Windows|{{p|game}}\\SaveFile.gwsave}}"
+    - "{{Game data/saves|OS X|{{p|game}}/Inscryption.App/SaveFile.gwsave}}"
 Insect Revolution VR:
   pageId: 134735
   steam: 1009510
@@ -99338,7 +99360,7 @@ Launch Squad:
   pageId: 88450
   templates:
     - "{{Game data/config|Windows|{{p|windir}}\\UbiSoft\\ubi.ini}}"
-    - "{{Game data/saves|Windows|{{p|game}}\\Gamedata\\SaveGame}}"
+    - "{{Game data/saves|Windows|{{p|game}}\\GameData\\SaveGame\\}}"
 "Lauren's visit":
   pageId: 108290
   steam: 918040
@@ -115140,6 +115162,8 @@ Mortal Shell:
   templates:
     - "{{Game data/config|Windows|{{P|userprofile\\Documents}}\\My Games\\MortalShell\\Dungeonhaven\\Saved\\Config\\WindowsNoEditor\\}}"
     - "{{Game data/saves|Windows|{{P|userprofile\\Documents}}\\My Games\\MortalShell\\Dungeonhaven\\Saved\\SaveGames\\}}"
+Mortal Sin:
+  pageId: 195390
 "Mortal Squad: Portal to Hell":
   pageId: 91874
   steam: 822910
@@ -134662,6 +134686,9 @@ Potentia:
   pageId: 64492
   steam: 652530
 Potion Craft:
+  cloud:
+    gog: true
+    steam: true
   gog: 1375812220
   gogSide:
     - 1481786313
@@ -137117,6 +137144,10 @@ Psychonauts:
     - "{{Game data/saves|OS X|{{p|osxhome}}/Library/Application Support/Psychonauts/Profiles/}}"
     - "{{Game data/saves|Linux|{{P|xdgdatahome}}/Psychonauts/Profiles/}}"
 Psychonauts 2:
+  cloud:
+    gog: true
+    steam: true
+    xbox: true
   gog: 1508046796
   gogSide:
     - 1731504234
@@ -137126,9 +137157,10 @@ Psychonauts 2:
   templates:
     - "{{Game data/config|Windows|{{P|localappdata}}\\Psychonauts2\\Saved\\Config\\WindowsNoEditor\\}}"
     - "{{Game data/config|Microsoft Store|{{P|localappdata}}\\Packages\\Microsoft.Psychonauts2_8wekyb3d8bbwe\\LocalCache\\Local\\Psychonauts2\\Saved\\Config\\WinGDK\\}}"
+    - "{{Game data/config|OS X|{{p|osxhome}}/Library/Application Support/Epic/Psychonauts2/Saved/SaveGames}}"
     - "{{Game data/saves|Windows|{{P|localappdata}}\\Psychonauts2\\Saved\\SaveGames\\}}"
     - "{{Game data/saves|Microsoft Store|{{P|localappdata}}\\Packages\\Microsoft.Psychonauts2_8wekyb3d8bbwe\\SystemAppData\\wgs\\}}"
-    - "{{Game data/saves|OS X|{{P|osxhome}}/Library/Containers/com.doublefine.psychonauts2/Data/Library/Application Support/Epic/Psychonauts2/Saved/}}"
+    - "{{Game data/saves|OS X|{{P|osxhome}}/Library/Application Support/Epic/Psychonauts2/Saved/SaveGames}}"
     - "{{Game data/saves|Linux|{{P|linuxhome}}/.config/Epic/Psychonauts2/}}"
 Psychonauts in the Rhombus of Ruin:
   lutris: psychonauts-in-the-rhombus-of-ruin
@@ -137707,8 +137739,13 @@ Putt-Putt Joins the Parade:
   templates:
     - "{{Game data/saves|Steam|{{p|game}}\\Putt-Putt 1\\Saves}}"
 Putt-Putt Saves the Zoo:
+  cloud:
+    steam: true
   pageId: 37291
   steam: 294660
+  templates:
+    - "{{Game data/config|Windows|{{p|game}}\\ScummVM_Windows}}"
+    - "{{Game data/saves|Windows|{{p|game}}\\Saves}}"
 Putt-Putt Travels through Time:
   pageId: 32018
   renamedFrom:
@@ -141060,6 +141097,7 @@ Rayman:
     - "{{Game data/saves|DOS|{{p|game}}\\RAYMAN#.SAV}}"
 "Rayman 2: The Great Escape":
   gog: 1207658940
+  lutris: rayman-2-the-great-escape
   pageId: 7330
   steam: 15060
   templates:
@@ -155399,11 +155437,17 @@ Shock Tactics:
   pageId: 39077
   steam: 473610
 Shock Troopers:
+  cloud:
+    gog: true
+    steam: true
+    xbox: true
   gog: 1633815479
+  malformed: true
   pageId: 43011
   steam: 366270
   templates:
     - "{{Game data/config|Windows|{{p|localappdata}}\\shocktro\\}}"
+    - "{{Game data/saves|Windows|{{p|localappdata}}\\shocktro\\}}"
 "Shock Troopers: 2nd Squad":
   gog: 1816849333
   pageId: 50783
@@ -165134,6 +165178,8 @@ Star Trek Timelines:
     - "{{Game data/config|DOS|C:\\TREKCD\\INTRPLAY.CFG}}"
     - "{{Game data/saves|DOS|C:\\TREKCD\\}}"
 "Star Trek: Armada":
+  cloud:
+    gog: true
   gog: 1582325353
   lutris: star-trek-armada
   pageId: 3577
@@ -166372,6 +166418,12 @@ Starsky & Hutch:
 Starsphere:
   pageId: 45900
   steam: 408750
+Starstream:
+  pageId: 195385
+  steam: 2989400
+  templates:
+    - "{{Game data/config|Windows|N/A}}"
+    - "{{Game data/saves|Windows|{{p|game}}\\Saves}}"
 Starstruck:
   pageId: 137133
   steam: 1054950