diff --git a/data/manifest.yaml b/data/manifest.yaml
index 2ce97ee3..d2340362 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -229990,7 +229990,7 @@ Graveyard Keeper:
         - save
       when:
         - os: windows
-    <home>/Library/Application Support/unity.Lazy Bear Games.Graveyard Keeper:
+    <home>/Library/Application Support/Lazy Bear Games/Graveyard Keeper:
       tags:
         - save
       when:
@@ -482361,17 +482361,17 @@ Sonic Superstars:
       tags:
         - save
       when:
-        - os: windows
+        - store: steam
     <winAppData>/SonicSuperstars/Steam/SonicSuperstarsSystemData.bin:
       tags:
         - save
       when:
-        - os: windows
+        - store: steam
     <winAppData>/SonicSuperstars/Steam/SonicSuperstarsTimeAttackData_*.bin:
       tags:
         - save
       when:
-        - os: windows
+        - store: steam
   registry:
     HKEY_CURRENT_USER/Software/sega co. ltd/SonicSuperstars:
       tags:
@@ -573425,7 +573425,7 @@ Tom Clancy's Rainbow Six Siege:
         - config
   steam:
     id: 359550
-'Tom Clancy''s Rainbow Six: Covert Operations Essentials':
+'Tom Clancy''s Rainbow Six: Covert Ops Essentials':
   files:
     <base>/data/Save:
       tags:
@@ -573463,6 +573463,9 @@ Tom Clancy's Rainbow Six Siege:
         - save
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 19910
   installDir:
     Rainbow Six 2 Rogue Spear: {}
   launch:
@@ -606885,7 +606888,7 @@ Wally and the FANTASTIC PREDATORS:
             store: steam
   steam:
     id: 1077450
-Waltz of the Wizard:
+Waltz of the Wizard (Legacy demo):
   installDir:
     Waltz of the Wizard: {}
   registry:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 2c125402..78e234ee 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -70482,7 +70482,7 @@ Graveyard Keeper:
     - '{{Game data/config|OS X|{{p|osxhome}}/Library/Preferences/unity.Lazy Bear Games.Graveyard Keeper.plist}}'
     - '{{Game data/config|Linux|{{p|linuxhome}}/.config/unity3d/Lazy Bear Games/Graveyard Keeper/prefs}}'
     - '{{Game data/saves|Windows|{{p|userprofile}}\AppData\LocalLow\Lazy Bear Games\Graveyard Keeper}}'
-    - '{{Game data/saves|OS X|{{p|osxhome}}/Library/Application Support/unity.Lazy Bear Games.Graveyard Keeper}}'
+    - '{{Game data/saves|OS X|{{p|osxhome}}/Library/Application Support/Lazy Bear Games/Graveyard Keeper}}'
     - '{{Game data/saves|Linux|{{p|linuxhome}}/.config/unity3d/Lazy Bear Games/Graveyard Keeper}}'
 Graveyard Shift:
   pageId: 51951
@@ -147738,7 +147738,7 @@ Sonic Superstars:
   templates:
     - '{{Game data/config|Windows|{{p|hkcu}}\Software\sega co. ltd\SonicSuperstars\}}'
     - >-
-      {{Game data/saves|Windows|{{p|appdata}}\SonicSuperstars\Steam\SonicSuperstarsStoryData.bin |
+      {{Game data/saves|Steam|{{p|appdata}}\SonicSuperstars\Steam\SonicSuperstarsStoryData.bin |
       {{p|appdata}}\SonicSuperstars\Steam\SonicSuperstarsSystemData.bin |
       {{p|appdata}}\SonicSuperstars\Steam\SonicSuperstarsTimeAttackData_*.bin}}
 Sonic the Hedgehog:
@@ -175485,8 +175485,10 @@ Tom Clancy's Rainbow Six Siege:
       {{Game data/config|Windows|{{P|userprofile\Documents}}\My Games\Rainbow Six -
       Siege\{{p|uid}}\GameSettings.ini|{{p|hkcu}}\Software\Ubisoft\Rainbow Six - Siege\}}
     - '{{Game data/saves|Windows|{{P|uplay}}\savegames\{{P|uid}}\635\}}'
-'Tom Clancy''s Rainbow Six: Covert Operations Essentials':
+'Tom Clancy''s Rainbow Six: Covert Ops Essentials':
   pageId: 25831
+  renamedFrom:
+    - 'Tom Clancy''s Rainbow Six: Covert Operations Essentials'
   templates:
     - '{{Game data/config|Windows|{{p|hklm}}\SOFTWARE\{{p|wow64}}\Red Storm Entertainment\Rogue Spear}}'
     - '{{Game data/saves|Windows|{{p|game}}\data\Save\}}'
@@ -175499,6 +175501,8 @@ Tom Clancy's Rainbow Six Siege:
 'Tom Clancy''s Rainbow Six: Rogue Spear':
   pageId: 18401
   steam: 13660
+  steamSide:
+    - 19910
   templates:
     - '{{Game data/config|Windows|{{p|hklm}}\SOFTWARE\{{p|wow64}}\Red Storm Entertainment\Rogue Spear}}'
     - '{{Game data/saves|Windows|{{p|game}}\data\save\}}'
@@ -186043,8 +186047,10 @@ Wally and the FANTASTIC PREDATORS:
   templates:
     - '{{Game data/config|Windows|<code>C:\Windows\disney.ini</code>}}'
     - '{{Game data/saves|Windows|<code>{{P|game}}\WDWRacing.dat</code>}}'
-Waltz of the Wizard:
+Waltz of the Wizard (Legacy demo):
   pageId: 37187
+  renamedFrom:
+    - Waltz of the Wizard
   steam: 436820
   templates:
     - '{{Game data/config|Windows|{{P|hkcu}}\Software\Aldin\Waltz of the Wizard}}'