diff --git a/data/manifest.yaml b/data/manifest.yaml
index fc6a3407..23f9a5ec 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -9391,6 +9391,8 @@ A More Beautiful World:
         - config
       when:
         - os: windows
+  id:
+    lutris: a-morticians-tale
   installDir:
     "A Mortician's Tale": {}
   launch:
@@ -29155,6 +29157,7 @@ Aliens&Asteroids:
       when:
         - os: windows
   id:
+    lutris: aliens-dark-descent
     steamExtra:
       - 1155310
       - 2272330
@@ -51275,6 +51278,8 @@ Atelier Tia:
         - save
       when:
         - os: windows
+  id:
+    lutris: atelier-tia
   installDir:
     Atelier Tia: {}
   launch:
@@ -54769,6 +54774,8 @@ Avorion:
   steam:
     id: 445220
 Avowed:
+  id:
+    lutris: avowed
   steam:
     id: 2457220
 Aw Nutz:
@@ -101548,32 +101555,6 @@ Caffeine:
             store: steam
   steam:
     id: 323680
-"Caffeine: Victoria's Legacy":
-  files:
-    "<base>/game/saves":
-      when:
-        - store: steam
-  installDir:
-    "Caffeine Victoria's Legacy": {}
-  launch:
-    "<base>/Caffeine_Victorias_Legacy.app/Contents/MacOS/Caffeine_Victorias_Legacy":
-      - when:
-          - os: mac
-            store: steam
-    "<base>/Caffeine_Victorias_Legacy.exe":
-      - when:
-          - os: windows
-            store: steam
-    "<base>/Caffeine_Victorias_Legacy.sh":
-      - when:
-          - bit: 32
-            os: linux
-            store: steam
-          - bit: 64
-            os: linux
-            store: steam
-  steam:
-    id: 890700
 Café International:
   installDir:
     CafeInternational: {}
@@ -120356,6 +120337,8 @@ Ciel Fledge:
       when:
         - os: linux
           store: steam
+  id:
+    lutris: ciel-fledge
   installDir:
     Ciel Fledge: {}
   launch:
@@ -128079,6 +128062,8 @@ Cold War:
         - save
       when:
         - os: windows
+  id:
+    lutris: cold-war
   installDir:
     Cold War: {}
   launch:
@@ -190774,6 +190759,15 @@ Dragon Quest Heroes II:
 Dragon Quest III HD-2D Remake:
   cloud:
     steam: true
+  files:
+    "<winDocuments>/My Games/DRAGON QUEST III HD-2D Remake/Steam/<storeUserId>/SaveGames":
+      tags:
+        - save
+      when:
+        - os: windows
+          store: steam
+  installDir:
+    DRAGON QUEST III HD-2D Remake: {}
   steam:
     id: 2701660
 "Dragon Quest Monsters: The Dark Prince":
@@ -293879,6 +293873,8 @@ Hard Work:
   steam:
     id: 845520
 Hard to Be a God:
+  id:
+    lutris: hard-to-be-a-god
   installDir:
     Hard to Be a God: {}
   launch:
@@ -376740,6 +376736,7 @@ Loco Motive:
   id:
     lutris: loco-motive
     steamExtra:
+      - 1960850
       - 2873680
   steam:
     id: 1709880
@@ -458660,6 +458657,8 @@ OpenArena:
         - config
       when:
         - os: windows
+  id:
+    lutris: openarena
 OpenHV:
   files:
     "<home>/Library/Application Support/OpenRA":
@@ -526199,6 +526198,9 @@ Retrowave:
         - save
   steam:
     id: 1239690
+Retrowave 2:
+  steam:
+    id: 3331000
 Retrowave World:
   id:
     steamExtra:
@@ -582373,6 +582375,8 @@ Snakebird Primer:
         - config
       when:
         - os: linux
+  id:
+    lutris: snakebird-primer
   installDir:
     Snakebird Primer: {}
   launch:
@@ -740889,6 +740893,17 @@ WEBFISHING:
         - save
       when:
         - os: windows
+  id:
+    lutris: webfishing
+  installDir:
+    WEBFISHING: {}
+  launch:
+    "<base>/webfishing.exe":
+      - when:
+          - os: windows
+            store: steam
+  steam:
+    id: 3146520
 WEJAM:
   installDir:
     WEJAM: {}
@@ -744498,6 +744513,40 @@ Warchasm:
     Warchasm: {}
   steam:
     id: 1184260
+Warcraft I Remastered:
+  files:
+    "<home>/Saved Games/WarcraftRemastered/*.sav":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<home>/Saved Games/WarcraftRemastered/GlobalSave.json":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<home>/Saved Games/WarcraftRemastered/PREFS.WAR":
+      tags:
+        - config
+      when:
+        - os: windows
+Warcraft II Remastered:
+  files:
+    "<home>/Saved Games/Warcraft2Remastered/*.sav":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<home>/Saved Games/Warcraft2Remastered/GlobalSave.json":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<home>/Saved Games/Warcraft2Remastered/Warcraft2.ini":
+      tags:
+        - config
+      when:
+        - os: windows
 "Warcraft II: Battle.net Edition":
   cloud:
     gog: true
diff --git a/data/missing.md b/data/missing.md
index cbfb5c9b..08c6f0f0 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -3953,6 +3953,7 @@
 * [Cafe Crush](https://www.pcgamingwiki.com/wiki/?curid=139265)
 * [Cafe Owner Simulator](https://www.pcgamingwiki.com/wiki/?curid=178544)
 * [Caffeine](https://www.pcgamingwiki.com/wiki/?curid=46090)
+* [Caffeine: Victoria's Legacy](https://www.pcgamingwiki.com/wiki/?curid=105607)
 * [Café International](https://www.pcgamingwiki.com/wiki/?curid=124603)
 * [CAGE](https://www.pcgamingwiki.com/wiki/?curid=53095)
 * [Cahors Sunset](https://www.pcgamingwiki.com/wiki/?curid=48969)
@@ -7454,7 +7455,6 @@
 * [Dragon of Legends](https://www.pcgamingwiki.com/wiki/?curid=77230)
 * [Dragon Orb](https://www.pcgamingwiki.com/wiki/?curid=77118)
 * [Dragon Perception](https://www.pcgamingwiki.com/wiki/?curid=74181)
-* [Dragon Quest III HD-2D Remake](https://www.pcgamingwiki.com/wiki/?curid=195874)
 * [Dragon Quest Rivals Ace](https://www.pcgamingwiki.com/wiki/?curid=167922)
 * [Dragon Quest X](https://www.pcgamingwiki.com/wiki/?curid=59146)
 * [Dragon Quest+](https://www.pcgamingwiki.com/wiki/?curid=195040)
@@ -10792,6 +10792,7 @@
 * [Graduation](https://www.pcgamingwiki.com/wiki/?curid=190056)
 * [Grail to the Thief](https://www.pcgamingwiki.com/wiki/?curid=47791)
 * [GRally](https://www.pcgamingwiki.com/wiki/?curid=90346)
+* [Gran saga](https://www.pcgamingwiki.com/wiki/?curid=199242)
 * [Gran Skrea Online](https://www.pcgamingwiki.com/wiki/?curid=80954)
 * [Granado Espada](https://www.pcgamingwiki.com/wiki/?curid=45071)
 * [Grand Academy for Future Villains](https://www.pcgamingwiki.com/wiki/?curid=71782)
@@ -20752,6 +20753,7 @@
 * [RetroGunX](https://www.pcgamingwiki.com/wiki/?curid=68659)
 * [Retroids](https://www.pcgamingwiki.com/wiki/?curid=103867)
 * [RetroVamp](https://www.pcgamingwiki.com/wiki/?curid=153039)
+* [Retrowave 2](https://www.pcgamingwiki.com/wiki/?curid=199247)
 * [Retrowave World](https://www.pcgamingwiki.com/wiki/?curid=196437)
 * [Return Home](https://www.pcgamingwiki.com/wiki/?curid=130484)
 * [Return Null - Episode 1](https://www.pcgamingwiki.com/wiki/?curid=48292)
@@ -29048,8 +29050,6 @@
 * [Warbrush](https://www.pcgamingwiki.com/wiki/?curid=148693)
 * [Warchasm](https://www.pcgamingwiki.com/wiki/?curid=154103)
 * [Warcraft Adventures: Lord of the Clans](https://www.pcgamingwiki.com/wiki/?curid=147218)
-* [Warcraft I Remastered](https://www.pcgamingwiki.com/wiki/?curid=199227)
-* [Warcraft II Remastered](https://www.pcgamingwiki.com/wiki/?curid=199228)
 * [Warcraft: Rumble](https://www.pcgamingwiki.com/wiki/?curid=199240)
 * [Warden](https://www.pcgamingwiki.com/wiki/?curid=151625)
 * [Wardialler](https://www.pcgamingwiki.com/wiki/?curid=135899)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index 08392ba9..40dd36d3 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -595245,6 +595245,72 @@
       executable: TheCrewMotorfest.exe
       type: default
 2701660:
+  cloud:
+    saves:
+      - path: "My Games/DRAGON QUEST III HD-2D Remake/Steam/{64BitSteamID}"
+        pattern: Capture*.sav
+        recursive: true
+        root: WinMyDocuments
+      - path: "My Games/DRAGON QUEST III HD-2D Remake/Steam/{64BitSteamID}"
+        pattern: "*SaveData*.sav"
+        recursive: true
+        root: WinMyDocuments
+      - path: "My Games/DRAGON QUEST III HD-2D Remake/Steam/{64BitSteamID}"
+        pattern: SystemData_0.sav
+        recursive: true
+        root: WinMyDocuments
+  installDir: DRAGON QUEST III HD-2D Remake
+  launch:
+    - config:
+        betakey: denuvo
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
+    - config:
+        betakey: development
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
+    - config:
+        betakey: virtual_keyboard_test
+        osarch: "64"
+        oslist: windows
+      executable: Nicola.exe
+    - config:
+        betakey: development_weekly
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
+    - config:
+        betakey: rating
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
+    - config:
+        betakey: shipping
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
+    - config:
+        betakey: shipping_weekly
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
+    - config:
+        betakey: test
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
+    - config:
+        betakey: test_weekly
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
+    - config:
+        betakey: summer_game_fest
+        osarch: "64"
+        oslist: windows
+      executable: DQIIIHD2DRemake.exe
   nameLocalized:
     english: DRAGON QUEST III HD-2D Remake
     japanese: ドラゴンクエストIII　そして伝説へ…
@@ -597764,6 +597830,13 @@
     spanish: "Atelier Yumia: La alquimista de los recuerdos y la tierra imaginada"
     tchinese: 優米雅的鍊金工房 ～追憶之鍊金術士與幻創之地～
 3138660: {}
+3146520:
+  installDir: WEBFISHING
+  launch:
+    - config:
+        oslist: windows
+      executable: webfishing.exe
+      type: default
 3151670: {}
 3152540:
   cloud:
@@ -597907,4 +597980,5 @@
     russian: "Ликвидатор 2: Добро пожаловать в ад"
 3319580: {}
 3319590: {}
+3331000: {}
 3221903386: {}
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 48968425..f3260829 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -2854,6 +2854,7 @@ A More Beautiful World:
   pageId: 39458
   steam: 436680
 "A Mortician's Tale":
+  lutris: a-morticians-tale
   pageId: 58394
   steam: 578720
   templates:
@@ -9055,6 +9056,7 @@ Aliens&Asteroids:
 "Aliens: Dark Descent":
   cloud:
     steam: true
+  lutris: aliens-dark-descent
   pageId: 178263
   steam: 1150440
   steamSide:
@@ -16099,6 +16101,7 @@ Atari Vault:
     - "{{Game data/config|Windows|{{P|userprofile\\Documents}}\\KoeiTecmo\\Atelier Sophie DX}}"
     - "{{Game data/saves|Windows|{{P|userprofile\\Documents}}\\KoeiTecmo\\Atelier Sophie DX\\SAVEDATA}}"
 Atelier Tia:
+  lutris: atelier-tia
   pageId: 192436
   steam: 1446480
   templates:
@@ -17204,6 +17207,9 @@ Avorion:
     - "{{Game data/saves|Windows|{{p|appdata}}\\Avorion}}"
     - "{{Game data/saves|Linux|{{p|linuxhome}}/.avorion}}"
 Avowed:
+  cloud:
+    xbox: true
+  lutris: avowed
   pageId: 162116
   steam: 2457220
 Aw Nutz:
@@ -32083,8 +32089,8 @@ Caffeine:
   steamSide:
     - 408660
 "Caffeine: Victoria's Legacy":
+  malformed: true
   pageId: 105607
-  steam: 890700
 Café International:
   pageId: 124603
   steam: 965210
@@ -37949,6 +37955,7 @@ Cicadas - The IQA Edition:
 Ciel Fledge:
   cloud:
     steam: true
+  lutris: ciel-fledge
   pageId: 75707
   steam: 738270
 "Ciel Nosurge: Requiem for a Lost Star DX":
@@ -40341,6 +40348,7 @@ Cold Vengeance:
   pageId: 39404
   steam: 502540
 Cold War:
+  lutris: cold-war
   pageId: 50730
   steam: 260650
   templates:
@@ -60214,6 +60222,8 @@ Dragon Quest III HD-2D Remake:
     steam: true
   pageId: 195874
   steam: 2701660
+  templates:
+    - "{{Game data/saves|Steam|{{p|userprofile\\Documents}}\\My Games\\DRAGON QUEST III HD-2D Remake\\Steam\\{{p|uid}}\\SaveGames}}"
 "Dragon Quest Monsters: The Dark Prince":
   cloud:
     steam: true
@@ -88386,6 +88396,8 @@ Gran Vitreous:
     steam: true
   pageId: 47855
   steam: 346340
+Gran saga:
+  pageId: 199242
 Granado Espada:
   pageId: 45071
   steam: 319730
@@ -93140,6 +93152,7 @@ Hard Work:
   pageId: 95186
   steam: 845520
 Hard to Be a God:
+  lutris: hard-to-be-a-god
   pageId: 46751
   steam: 391030
 Hard-Life:
@@ -119549,6 +119562,7 @@ Loco Motive:
   pageId: 199236
   steam: 1709880
   steamSide:
+    - 1960850
     - 2873680
 Loco Parentis VR:
   pageId: 135459
@@ -146046,6 +146060,7 @@ Open the Door:
   pageId: 93158
   steam: 849000
 OpenArena:
+  lutris: openarena
   pageId: 19961
   templates:
     - "{{Game data/config|Windows|{{p|appdata}}\\OpenArena\\baseoa}}"
@@ -167504,6 +167519,9 @@ Retrowave:
   templates:
     - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\Rewindapp\\Retrowave}}"
     - "{{Game data/saves|Windows|{{P|hkcu}}\\Software\\Rewindapp\\Retrowave|{{P|steam}}\\userdata\\{{P|uid}}\\1239690\\remote\\CloudDataPlayer.dat}}"
+Retrowave 2:
+  pageId: 199247
+  steam: 3331000
 Retrowave World:
   pageId: 196437
   steam: 2413050
@@ -185217,6 +185235,7 @@ Snakebird Complete:
 Snakebird Primer:
   cloud:
     steam: true
+  lutris: snakebird-primer
   pageId: 127779
   steam: 1014140
   templates:
@@ -236531,7 +236550,9 @@ WBTR - Welcome Back To Reality:
 WCW Nitro:
   pageId: 162266
 WEBFISHING:
+  lutris: webfishing
   pageId: 199241
+  steam: 3146520
   templates:
     - "{{Game data/config|Windows|{{P|appdata}}\\Godot\\app_userdata\\webfishing_2_newver\\}}"
     - "{{Game data/saves|Windows|{{P|appdata}}\\Godot\\app_userdata\\webfishing_2_newver\\}}"
@@ -237708,8 +237729,14 @@ Warchasm:
   pageId: 147218
 Warcraft I Remastered:
   pageId: 199227
+  templates:
+    - "{{Game data/config|Windows|{{p|userprofile}}\\Saved Games\\WarcraftRemastered\\PREFS.WAR}}"
+    - "{{Game data/saves|Windows|{{p|userprofile}}\\Saved Games\\WarcraftRemastered\\*.sav|{{p|userprofile}}\\Saved Games\\WarcraftRemastered\\GlobalSave.json}}"
 Warcraft II Remastered:
   pageId: 199228
+  templates:
+    - "{{Game data/config|Windows|{{p|userprofile}}\\Saved Games\\Warcraft2Remastered\\Warcraft2.ini}}"
+    - "{{Game data/saves|Windows|{{p|userprofile}}\\Saved Games\\Warcraft2Remastered\\*.sav|{{p|userprofile}}\\Saved Games\\Warcraft2Remastered\\GlobalSave.json}}"
 "Warcraft II: Battle.net Edition":
   cloud:
     gog: true
diff --git a/data/wiki-malformed.md b/data/wiki-malformed.md
index 0a708297..3bf244fc 100644
--- a/data/wiki-malformed.md
+++ b/data/wiki-malformed.md
@@ -1,4 +1,5 @@
 * [Boneworks](https://www.pcgamingwiki.com/wiki/?curid=129124)
+* [Caffeine: Victoria's Legacy](https://www.pcgamingwiki.com/wiki/?curid=105607)
 * [Call of Duty: Modern Warfare II](https://www.pcgamingwiki.com/wiki/?curid=178173)
 * [Dead Island: Definitive Edition](https://www.pcgamingwiki.com/wiki/?curid=32947)
 * [Dead Island: Riptide Definitive Edition](https://www.pcgamingwiki.com/wiki/?curid=32949)