diff --git a/data/manifest.yaml b/data/manifest.yaml
index caed6af6..5622f5d7 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -123820,6 +123820,8 @@ Clash of the Monsters:
         - save
       when:
         - os: windows
+  id:
+    lutris: class-of-09-the-re-up
   installDir:
     "Class of '09 The Re-Up": {}
   launch:
@@ -180006,6 +180008,13 @@ Diner Bros:
 Diner Dash:
   id:
     lutris: diner-dash
+"Diner Dash 2: Restaurant Rescue":
+  files:
+    "<winAppData>/PlayFirst/dinerdash2":
+      tags:
+        - save
+      when:
+        - os: windows
 "Diner Dash: Flo on the Go":
   id:
     lutris: diner-dash-flo-on-the-go
@@ -299110,15 +299119,7 @@ Heave Ho:
   steam:
     id: 905340
 Heaven & Hell:
-  installDir:
-    Heaven & Hell: {}
-  launch:
-    "<base>/HeavenHell.exe":
-      - when:
-          - os: windows
-            store: steam
-  steam:
-    id: 980490
+  alias: Heaven and Hell (2012)
 Heaven & Hell 2:
   installDir:
     HeavenAndHell2: {}
@@ -299279,6 +299280,18 @@ Heaven Will Be Mine:
             store: steam
   steam:
     id: 836450
+Heaven and Hell:
+  alias: Heaven & Hell (2003)
+Heaven and Hell (2012):
+  installDir:
+    Heaven & Hell: {}
+  launch:
+    "<base>/HeavenHell.exe":
+      - when:
+          - os: windows
+            store: steam
+  steam:
+    id: 980490
 "Heaven's Grave":
   installDir:
     "Heaven's Grave": {}
@@ -403209,6 +403222,7 @@ MechWarrior 3:
     steamExtra:
       - 3170420
       - 3170430
+      - 3323880
   installDir:
     MechWarrior 5 Clans: {}
   launch:
diff --git a/data/missing.md b/data/missing.md
index 6ee534f6..0b6e3413 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -6972,7 +6972,6 @@
 * [Dimhaven Enigmas](https://www.pcgamingwiki.com/wiki/?curid=187859)
 * [Diminutive](https://www.pcgamingwiki.com/wiki/?curid=141220)
 * [Diner Dash](https://www.pcgamingwiki.com/wiki/?curid=194578)
-* [Diner Dash 2: Restaurant Rescue](https://www.pcgamingwiki.com/wiki/?curid=194647)
 * [Diner Dash 5: BOOM!](https://www.pcgamingwiki.com/wiki/?curid=194645)
 * [Diner Dash: Flo on the Go](https://www.pcgamingwiki.com/wiki/?curid=194636)
 * [Diner Dash: Flo Through Time](https://www.pcgamingwiki.com/wiki/?curid=194641)
@@ -11558,9 +11557,9 @@
 * [Heat Guardian](https://www.pcgamingwiki.com/wiki/?curid=81755)
 * [Heat Wave](https://www.pcgamingwiki.com/wiki/?curid=189790)
 * [Heathen Engineering's Terran](https://www.pcgamingwiki.com/wiki/?curid=44060)
-* [Heaven & Hell](https://www.pcgamingwiki.com/wiki/?curid=123790)
+* [Heaven & Hell (2003)](https://www.pcgamingwiki.com/wiki/?curid=92471)
 * [Heaven & Hell 2](https://www.pcgamingwiki.com/wiki/?curid=127669)
-* [Heaven and Hell](https://www.pcgamingwiki.com/wiki/?curid=92471)
+* [Heaven and Hell (2012)](https://www.pcgamingwiki.com/wiki/?curid=123790)
 * [HEAVEN AND HELL - the last war](https://www.pcgamingwiki.com/wiki/?curid=122424)
 * [Heaven Dust 2](https://www.pcgamingwiki.com/wiki/?curid=178928)
 * [Heaven Forest - VR MMO](https://www.pcgamingwiki.com/wiki/?curid=55159)
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 78b1a13a..f37453e5 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -39200,6 +39200,7 @@ Clash of the Monsters:
   templates:
     - "{{Game data/saves|Windows|{{P|game}}\\Class_Of_09-1.2\\game\\saves\\}}"
 "Class of '09: The Re-Up":
+  lutris: class-of-09-the-re-up
   pageId: 198682
   steam: 2318310
   templates:
@@ -56831,6 +56832,8 @@ Diner Dash:
   pageId: 194578
 "Diner Dash 2: Restaurant Rescue":
   pageId: 194647
+  templates:
+    - "{{Game data/saves|Windows|{{P|appdata}}\\PlayFirst\\dinerdash2\\}}"
 "Diner Dash 5: BOOM!":
   pageId: 194645
 "Diner Dash: Flo Through Time":
@@ -95084,9 +95087,10 @@ Heave Ho:
   templates:
     - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\Le Cartel Studio\\HeaveHo\\}}"
     - "{{Game data/saves|Windows|{{P|userprofile}}\\AppData\\LocalLow\\Le Cartel Studio\\HeaveHo\\Save\\HeaveHo*.save}}"
-Heaven & Hell:
-  pageId: 123790
-  steam: 980490
+Heaven & Hell (2003):
+  pageId: 92471
+  renamedFrom:
+    - Heaven and Hell
 Heaven & Hell 2:
   pageId: 127669
   steam: 962060
@@ -95133,8 +95137,11 @@ Heaven Will Be Mine:
   steam: 836450
   templates:
     - "{{Game data/saves|Windows|{{p|userprofile}}\\AppData\\LocalLow\\PillowFightIo\\HeavenWillBeMine}}"
-Heaven and Hell:
-  pageId: 92471
+Heaven and Hell (2012):
+  pageId: 123790
+  renamedFrom:
+    - Heaven & Hell
+  steam: 980490
 "Heaven's Dawn":
   pageId: 155243
 "Heaven's Grave":
@@ -128156,6 +128163,7 @@ MechWarrior 3:
   steamSide:
     - 3170420
     - 3170430
+    - 3323880
   templates:
     - "{{Game data/config|Windows|{{p|localappdata}}\\MW5Clans\\Saved\\Config\\Windows\\}}"
     - "{{Game data/saves|Windows|{{p|localappdata}}\\MW5Clans\\Saved\\SaveGames\\}}"