diff --git a/data/manifest.yaml b/data/manifest.yaml
index 67467dd6..ddabe9f5 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -101232,6 +101232,8 @@ Call of Duty Black Ops Cold War:
         - save
       when:
         - os: windows
+  id:
+    lutris: call-of-duty-modern-warfare-2-campaign-remastered
 "Call of Duty: Modern Warfare 3":
   cloud:
     steam: true
@@ -101280,6 +101282,8 @@ Call of Duty Black Ops Cold War:
         - save
       when:
         - os: windows
+  id:
+    lutris: call-of-duty-modern-warfare-iii
   steam:
     id: 2519060
 "Call of Duty: Modern Warfare Remastered":
@@ -129966,6 +129970,7 @@ Commander Keen in The Earth Explodes:
       when:
         - os: windows
   id:
+    lutris: commander-conquest-of-the-americas
     steamExtra:
       - 49310
       - 49311
@@ -135612,6 +135617,8 @@ Cosmonautica:
         - os: windows
   gog:
     id: 1434623024
+  id:
+    lutris: cosmonautica
   installDir:
     Cosmonautica: {}
   launch:
@@ -155643,6 +155650,8 @@ Darkened Skye:
         - save
       when:
         - os: windows
+  id:
+    lutris: darkened-skye
 Darkest Depths:
   installDir:
     Darkest Depths: {}
@@ -168525,6 +168534,11 @@ Demolish & Build 2017:
     "<base>/demolish.exe":
       - when:
           - store: steam
+  registry:
+    HKEY_CURRENT_USER/SOFTWARE/Noble Muffins/DemolishnBuild:
+      tags:
+        - config
+        - save
   steam:
     id: 470740
 Demolish & Build 2018:
@@ -286144,6 +286158,8 @@ Halls of Torment:
         - config
       when:
         - os: windows
+  id:
+    lutris: halls-of-torment
   installDir:
     Halls of Torment: {}
   launch:
@@ -370350,6 +370366,8 @@ London Detective Mysteria:
         - save
       when:
         - os: windows
+  id:
+    lutris: london-racer-police-madness
 Lone Echo II:
   files:
     "<base>/_local/saves":
@@ -438301,6 +438319,8 @@ Nodge:
   steam:
     id: 715590
 Nodiatis:
+  id:
+    lutris: nodiatis
   installDir:
     Nodiatis: {}
   launch:
@@ -481093,6 +481113,7 @@ Pools:
       when:
         - os: windows
   id:
+    lutris: pools
     steamExtra:
       - 2677470
   installDir:
@@ -484690,6 +484711,8 @@ Pressure:
         - config
       when:
         - os: windows
+  id:
+    lutris: pressure
   installDir:
     pressure: {}
   launch:
@@ -484702,6 +484725,8 @@ Pressure:
 Pressure Overdrive:
   cloud:
     steam: true
+  id:
+    lutris: pressure-overdrive
   installDir:
     PressureOverdrive: {}
   launch:
@@ -515725,6 +515750,9 @@ Restoration:
             store: steam
   steam:
     id: 688380
+Restricted Area:
+  id:
+    lutris: restricted-area
 Restricted-RPS - All Aboard The Icarus:
   installDir:
     Restricted-RPS: {}
@@ -523313,6 +523341,8 @@ Road Wars:
         - config
       when:
         - os: windows
+  id:
+    lutris: road-wars
 Road Works:
   installDir:
     RoadWorks: {}
@@ -575124,6 +575154,8 @@ Solas and the White Winter:
   steam:
     id: 1096530
 Soldat:
+  cloud:
+    steam: true
   files:
     "<base>/profiles/*.ini":
       when:
@@ -575137,6 +575169,8 @@ Soldat:
     "<base>/taunts.txt":
       when:
         - store: steam
+  id:
+    lutris: soldat
   installDir:
     Soldat: {}
   launch:
@@ -597829,6 +597863,8 @@ Starsiege:
       when:
         - os: windows
 Starsky & Hutch:
+  id:
+    lutris: starsky-hutch
   registry:
     HKEY_CURRENT_USER/Software/Empire Interactive/Starsky&Hutch:
       tags:
@@ -632616,10 +632652,14 @@ Tempest 4000:
   steam:
     id: 688140
 Tempest Citadel:
+  cloud:
+    steam: true
   files:
     "<winAppData>/Aartform/Citadel/Save/*.sav":
       when:
         - store: steam
+  id:
+    lutris: tempest-citadel
   installDir:
     Tempest Citadel: {}
   launch:
diff --git a/data/missing.md b/data/missing.md
index 8f91d09f..1c2cd27a 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -142,6 +142,7 @@
 * [3, 2, 1, Survive!](https://www.pcgamingwiki.com/wiki/?curid=94796)
 * [3-D Ultra Lionel Train Town](https://www.pcgamingwiki.com/wiki/?curid=16494)
 * [3-D Ultra Pinball](https://www.pcgamingwiki.com/wiki/?curid=192442)
+* [3-D Ultra Pinball: Thrillride](https://www.pcgamingwiki.com/wiki/?curid=196080)
 * [3-D Ultra Radio Control Racers](https://www.pcgamingwiki.com/wiki/?curid=8402)
 * [3..2..1..Grenades!](https://www.pcgamingwiki.com/wiki/?curid=61546)
 * [30 days to Defence](https://www.pcgamingwiki.com/wiki/?curid=148727)
@@ -6613,7 +6614,6 @@
 * [Demigods](https://www.pcgamingwiki.com/wiki/?curid=46064)
 * [Demise: Rise of the Ku'tan](https://www.pcgamingwiki.com/wiki/?curid=183322)
 * [Democracy](https://www.pcgamingwiki.com/wiki/?curid=91740)
-* [Demolish & Build 2017](https://www.pcgamingwiki.com/wiki/?curid=39137)
 * [Demolish & Build 2018](https://www.pcgamingwiki.com/wiki/?curid=65734)
 * [Demolition](https://www.pcgamingwiki.com/wiki/?curid=139196)
 * [Demolition Engineer](https://www.pcgamingwiki.com/wiki/?curid=93029)
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 886dbd95..76c3e6f9 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -1077,6 +1077,8 @@ $1 Ride:
     - "{{Game data/saves|Windows|{{p|game}}\\SCORES.BST}}"
 3-D Ultra Pinball:
   pageId: 192442
+"3-D Ultra Pinball: Thrillride":
+  pageId: 196080
 3-D Ultra Radio Control Racers:
   pageId: 8402
 3-in-1 Bundle Brain Trainings:
@@ -31921,6 +31923,7 @@ Call of Duty 2:
     - "{{Game data/config|Windows|{{p|game}}\\players\\}}"
     - "{{Game data/saves|Windows|{{p|game}}\\players\\save\\|{{p|game}}\\players\\settings_c.zip.iw4|{{p|game}}\\players\\settings_s.zip.iw4}}"
 "Call of Duty: Modern Warfare 2 Campaign Remastered":
+  lutris: call-of-duty-modern-warfare-2-campaign-remastered
   pageId: 158844
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\players2\\{{p|uid}}}}"
@@ -31944,6 +31947,7 @@ Call of Duty 2:
     - "{{Game data/config|Windows|{{P|userprofile\\Documents}}\\Call of Duty\\players}}"
     - "{{Game data/saves|Windows|{{P|userprofile\\Documents}}\\Call of Duty\\players}}"
 "Call of Duty: Modern Warfare III":
+  lutris: call-of-duty-modern-warfare-iii
   pageId: 189135
   steam: 2519060
   templates:
@@ -40801,6 +40805,7 @@ Commander Keen in The Earth Explodes:
   pageId: 189547
   steam: 2496830
 "Commander: Conquest of the Americas":
+  lutris: commander-conquest-of-the-americas
   pageId: 23281
   steam: 49300
   steamSide:
@@ -42585,6 +42590,7 @@ Cosmonautica:
   cloud:
     steam: true
   gog: 1434623024
+  lutris: cosmonautica
   pageId: 25310
   steam: 320340
   templates:
@@ -49029,6 +49035,8 @@ Darken VR:
   pageId: 104221
   steam: 910850
 Darkened Skye:
+  lutris: darkened-skye
+  malformed: true
   pageId: 97137
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\}}"
@@ -52957,6 +52965,9 @@ Democracy 4:
 Demolish & Build 2017:
   pageId: 39137
   steam: 470740
+  templates:
+    - "{{Game data/config|Windows|{{P|hkcu}}\\SOFTWARE\\Noble Muffins\\DemolishnBuild}}"
+    - "{{Game data/saves|Windows|{{P|hkcu}}\\SOFTWARE\\Noble Muffins\\DemolishnBuild}}"
 Demolish & Build 2018:
   pageId: 65734
   steam: 577670
@@ -90395,6 +90406,7 @@ Halloweenistry 2:
 Halls of Torment:
   cloud:
     steam: true
+  lutris: halls-of-torment
   pageId: 187340
   steam: 2218750
   templates:
@@ -117264,6 +117276,7 @@ London Racer II:
   templates:
     - "{{Game data/saves|Windows|{{p|game}}}}"
 "London Racer: Police Madness":
+  lutris: london-racer-police-madness
   pageId: 88282
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\ABP.ini}}"
@@ -139154,6 +139167,7 @@ Nodge:
   pageId: 78822
   steam: 715590
 Nodiatis:
+  lutris: nodiatis
   pageId: 53407
   steam: 541190
 Noel The Mortal Fate S1-7:
@@ -152897,6 +152911,7 @@ Pool of Radiance:
 Pools:
   cloud:
     steam: true
+  lutris: pools
   pageId: 194894
   steam: 2663530
   steamSide:
@@ -153970,6 +153985,7 @@ Press and Jump:
   pageId: 68931
   steam: 697940
 Pressure:
+  lutris: pressure
   pageId: 16801
   steam: 224220
   templates:
@@ -153977,6 +153993,7 @@ Pressure:
 Pressure Overdrive:
   cloud:
     steam: true
+  lutris: pressure-overdrive
   pageId: 62066
   steam: 425240
 Pressured:
@@ -163826,6 +163843,7 @@ Restoration:
   pageId: 67641
   steam: 688380
 Restricted Area:
+  lutris: restricted-area
   pageId: 188029
 Restricted-RPS - All Aboard The Icarus:
   pageId: 35190
@@ -166191,6 +166209,7 @@ Road Trip USA - Jigsaw Puzzles:
   pageId: 125643
   steam: 1007940
 Road Wars:
+  lutris: road-wars
   pageId: 25500
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\Road Wars\\Ini}}"
@@ -182482,6 +182501,9 @@ Solas and the White Winter:
     - "{{Game data/config|Windows|{{p|userprofile}}\\AppData\\LocalLow\\Tactical Adventures\\Solasta\\UserPreferences.xml}}"
     - "{{Game data/saves|Windows|{{p|userprofile}}\\AppData\\LocalLow\\Tactical Adventures\\Solasta\\Saves{{note|note=Previous location was ''\\Save Files'' instead of ''\\Saves''}}}}"
 Soldat:
+  cloud:
+    steam: true
+  lutris: soldat
   pageId: 113020
   steam: 638490
 Soldier Boyz:
@@ -189747,6 +189769,7 @@ Starsiege:
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\config\\ClientPrefs.cs}}"
 Starsky & Hutch:
+  lutris: starsky-hutch
   pageId: 89144
   templates:
     - "{{Game data/config|Windows|{{p|hkcu}}\\Software\\Empire Interactive\\Starsky&Hutch}}"
@@ -200486,6 +200509,9 @@ Tempest 4000:
     - "{{Game data/config|Windows|{{p|userprofile\\Documents}}\\Tempest4000_Savedata}}"
     - "{{Game data/saves|Windows|{{p|userprofile\\Documents}}\\Tempest4000_Savedata}}"
 Tempest Citadel:
+  cloud:
+    steam: true
+  lutris: tempest-citadel
   pageId: 75168
   steam: 436690
 Tempest Rising:
diff --git a/data/wiki-malformed.md b/data/wiki-malformed.md
index 5302b811..4ab46961 100644
--- a/data/wiki-malformed.md
+++ b/data/wiki-malformed.md
@@ -7,6 +7,7 @@
 * [Counter-Strike Online 2](https://www.pcgamingwiki.com/wiki/?curid=162639)
 * [Creepy Castle](https://www.pcgamingwiki.com/wiki/?curid=39349)
 * [Dark Deception](https://www.pcgamingwiki.com/wiki/?curid=111922)
+* [Darkened Skye](https://www.pcgamingwiki.com/wiki/?curid=97137)
 * [Donald Duck: Goin' Quackers](https://www.pcgamingwiki.com/wiki/?curid=80156)
 * [Duck Season](https://www.pcgamingwiki.com/wiki/?curid=69641)
 * [Dungeon Keeper](https://www.pcgamingwiki.com/wiki/?curid=7396)