diff --git a/data/manifest.yaml b/data/manifest.yaml
index a8076654..4ca9e70f 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -10026,16 +10026,16 @@ AAAAXY:
         - save
       when:
         - os: mac
-    'C:/Users/%USERNAME%/AppData/Local/AAAAXY':
-      tags:
-        - config
-      when:
-        - os: windows
-    'C:/Users/%USERNAME%/Saved Games/AAAAXY':
+    <home>/Saved Games/AAAAXY:
       tags:
         - save
       when:
         - os: windows
+    <winLocalAppData>/AAAAXY:
+      tags:
+        - config
+      when:
+        - os: windows
 ABANdon02:
   installDir:
     aBANdon02: {}
@@ -165990,6 +165990,31 @@ Dynasty Warriors 6:
         - config
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 343620
+      - 348680
+      - 348681
+      - 348682
+      - 348683
+      - 348684
+      - 348685
+      - 348686
+      - 348687
+      - 349930
+      - 349931
+      - 349932
+      - 349933
+      - 349934
+      - 349935
+      - 349936
+      - 349937
+      - 349938
+      - 349939
+      - 349940
+      - 349941
+      - 352830
+      - 363630
   installDir:
     Dynasty Warriors 8 - Empires: {}
   launch:
@@ -166019,6 +166044,30 @@ Dynasty Warriors 6:
         - config
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 288590
+      - 316440
+      - 316441
+      - 316442
+      - 316443
+      - 316444
+      - 316445
+      - 316446
+      - 316447
+      - 316448
+      - 316820
+      - 316821
+      - 316860
+      - 316861
+      - 316862
+      - 316863
+      - 316864
+      - 316865
+      - 316866
+      - 316867
+      - 316868
+      - 316869
   installDir:
     Dynasty Warriors 8: {}
   launch:
@@ -166031,7 +166080,7 @@ Dynasty Warriors 6:
           - os: windows
             store: steam
   registry:
-    HKEY_CURRENT_USER/Software/TecmoKoei/Dynasty Warriors 8/*.*:
+    HKEY_CURRENT_USER/Software/TecmoKoei/Dynasty Warriors 8:
       tags:
         - config
   steam:
@@ -166048,6 +166097,182 @@ Dynasty Warriors 9:
         - config
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 776520
+      - 776530
+      - 798860
+      - 798870
+      - 798880
+      - 835590
+      - 892390
+      - 892391
+      - 892392
+      - 892393
+      - 892394
+      - 892395
+      - 892396
+      - 892397
+      - 892398
+      - 892399
+      - 956700
+      - 956701
+      - 956702
+      - 956703
+      - 956704
+      - 956705
+      - 956706
+      - 956707
+      - 956708
+      - 956709
+      - 956720
+      - 956721
+      - 956722
+      - 956723
+      - 956724
+      - 956725
+      - 956726
+      - 956727
+      - 956728
+      - 956729
+      - 956730
+      - 956731
+      - 956732
+      - 956733
+      - 956734
+      - 956735
+      - 956736
+      - 956737
+      - 956738
+      - 956739
+      - 956750
+      - 956751
+      - 956752
+      - 956753
+      - 956760
+      - 956761
+      - 956762
+      - 956763
+      - 956764
+      - 956765
+      - 956766
+      - 956767
+      - 956768
+      - 956769
+      - 956770
+      - 956771
+      - 956772
+      - 956860
+      - 956861
+      - 956862
+      - 956863
+      - 956864
+      - 956865
+      - 956866
+      - 956867
+      - 956868
+      - 956869
+      - 956890
+      - 956891
+      - 956892
+      - 956893
+      - 956894
+      - 956895
+      - 956896
+      - 956897
+      - 956898
+      - 956899
+      - 956920
+      - 956921
+      - 956922
+      - 956923
+      - 956924
+      - 956930
+      - 956940
+      - 956941
+      - 956942
+      - 956943
+      - 956944
+      - 956945
+      - 956946
+      - 956947
+      - 956948
+      - 956949
+      - 962300
+      - 962301
+      - 962302
+      - 962303
+      - 962304
+      - 962305
+      - 962306
+      - 963070
+      - 964930
+      - 964931
+      - 964932
+      - 964933
+      - 964934
+      - 964935
+      - 964936
+      - 964937
+      - 964938
+      - 978850
+      - 978851
+      - 978852
+      - 978853
+      - 978854
+      - 978855
+      - 978856
+      - 978857
+      - 978858
+      - 978859
+      - 978860
+      - 978861
+      - 978862
+      - 978863
+      - 978864
+      - 978865
+      - 978866
+      - 978867
+      - 1019960
+      - 1019961
+      - 1019962
+      - 1019963
+      - 1019964
+      - 1019965
+      - 1019966
+      - 1019967
+      - 1019968
+      - 1019969
+      - 1019970
+      - 1019971
+      - 1019980
+      - 1019981
+      - 1019982
+      - 1019983
+      - 1019984
+      - 1019985
+      - 1019986
+      - 1019987
+      - 1019988
+      - 1019989
+      - 1019990
+      - 1019991
+      - 1019992
+      - 1019993
+      - 1019994
+      - 1052520
+      - 1094180
+      - 1094181
+      - 1094182
+      - 1094183
+      - 1094184
+      - 1094185
+      - 1094186
+      - 1094187
+      - 1246840
+      - 1246841
+      - 1246842
+      - 1246843
   installDir:
     Dynasty Warriors 9: {}
   launch:
@@ -166074,6 +166299,31 @@ Dynasty Warriors 9:
         - config
       when:
         - os: windows
+  id:
+    steamExtra:
+      - 1684140
+      - 1684141
+      - 1684146
+      - 1684147
+      - 1684148
+      - 1684149
+      - 1684150
+      - 1684151
+      - 1684152
+      - 1684153
+      - 1684154
+      - 1684155
+      - 1684156
+      - 1684157
+      - 1684158
+      - 1684159
+      - 1684160
+      - 1684161
+      - 1684162
+      - 1684163
+      - 1684164
+      - 1684165
+      - 1684166
   installDir:
     Dynasty Warriors 9 Empires: {}
   launch:
@@ -167655,16 +167905,16 @@ Eared Hero:
     id: 715980
 Earn to Die 2:
   files:
+    <base>/app.icf:
+      tags:
+        - config
+      when:
+        - os: windows
     <base>/profile.dat:
       tags:
         - save
       when:
         - os: windows
-    'C:/Program Files (x86)/Steam/steamapps/common/Earn to Die 2/app.icf':
-      tags:
-        - config
-      when:
-        - os: windows
   installDir:
     Earn to Die 2: {}
   launch:
@@ -339102,6 +339352,12 @@ Modbox:
   steam:
     id: 414120
 Model Builder:
+  files:
+    <winDocuments>/Model Builder/Saves:
+      tags:
+        - save
+      when:
+        - os: windows
   installDir:
     Model Builder: {}
   launch:
@@ -517597,6 +517853,11 @@ Syberia II:
         - os: windows
   gog:
     id: 1731334260
+  id:
+    gogExtra:
+      - 1185739490
+    steamExtra:
+      - 1421230
   installDir:
     Syberia - The World Before: {}
   launch:
diff --git a/data/missing.md b/data/missing.md
index ea129308..79aa5e76 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -19932,7 +19932,6 @@
 * [MochiMochi](https://www.pcgamingwiki.com/wiki/?curid=110800)
 * [Mocove Arts VR](https://www.pcgamingwiki.com/wiki/?curid=63767)
 * [Modbox](https://www.pcgamingwiki.com/wiki/?curid=43744)
-* [Model Builder](https://www.pcgamingwiki.com/wiki/?curid=151579)
 * [Model DE Fight](https://www.pcgamingwiki.com/wiki/?curid=99456)
 * [Model Kit Simulator VR](https://www.pcgamingwiki.com/wiki/?curid=156256)
 * [Model Railway Easily](https://www.pcgamingwiki.com/wiki/?curid=155616)
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 3def2605..c142bce2 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -2831,10 +2831,10 @@ AA Touch Gun!:
 AAAAXY:
   pageId: 185075
   templates:
-    - '{{Game data/config|Windows|C:\Users\%USERNAME%\AppData\Local\AAAAXY}}'
+    - '{{Game data/config|Windows|{{P|localappdata}}\AAAAXY\}}'
     - '{{Game data/config|OS X|~/Library/Application Support/AAAAXY/config}}'
     - '{{Game data/config|Linux|~/.config/AAAAXY}}'
-    - '{{Game data/saves|Windows|C:\Users\%USERNAME%\Saved Games\AAAAXY}}'
+    - '{{Game data/saves|Windows|{{p|userprofile}}\Saved Games\AAAAXY\}}'
     - '{{Game data/saves|OS X|~/Library/Application Support/AAAAXY/save}}'
     - '{{Game data/saves|Linux|~/.local/share/AAAAXY}}'
 ABANdon02:
@@ -50304,43 +50304,289 @@ Dynasty Warriors 6:
   templates:
     - >-
       {{Game data/config|Windows|{{p|hkcu}}\Software\KoeiTecmo\Dynasty Warriors 7
-      DX\*|{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 7 DX\inputmap*.dat}}
+      DX\|{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 7 DX\inputmap*.dat}}
     - '{{Game data/saves|Windows|{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 7 DX\Savedata\save.dat}}'
 'Dynasty Warriors 8: Empires':
   pageId: 22801
   steam: 322520
+  steamSide:
+    - 343620
+    - 348680
+    - 348681
+    - 348682
+    - 348683
+    - 348684
+    - 348685
+    - 348686
+    - 348687
+    - 349930
+    - 349931
+    - 349932
+    - 349933
+    - 349934
+    - 349935
+    - 349936
+    - 349937
+    - 349938
+    - 349939
+    - 349940
+    - 349941
+    - 352830
+    - 363630
   templates:
     - >-
       {{Game data/config|Windows|{{p|hkcu}}\Software\KoeiTecmo\{{LocalizedPath|Dynasty Warriors 8
-      Empires}}\*|{{p|userprofile\Documents}}\KoeiTecmo\{{LocalizedPath|Dynasty Warriors 8}}\inputmap*.dat}}
+      Empires}}\|{{p|userprofile\Documents}}\KoeiTecmo\{{LocalizedPath|Dynasty Warriors 8}}\inputmap*.dat}}
     - >-
       {{Game data/saves|Windows|{{p|userprofile\Documents}}\KoeiTecmo\{{LocalizedPath|Dynasty Warriors 8
       Empires}}\Savedata\*.dat}}
 'Dynasty Warriors 8: Xtreme Legends':
   pageId: 17223
   steam: 278080
+  steamSide:
+    - 288590
+    - 316440
+    - 316441
+    - 316442
+    - 316443
+    - 316444
+    - 316445
+    - 316446
+    - 316447
+    - 316448
+    - 316820
+    - 316821
+    - 316860
+    - 316861
+    - 316862
+    - 316863
+    - 316864
+    - 316865
+    - 316866
+    - 316867
+    - 316868
+    - 316869
   templates:
     - >-
       {{Game data/config|Windows|{{p|hkcu}}\Software\TecmoKoei\{{LocalizedPath|Dynasty Warriors
-      8}}\*.*|{{p|userprofile\Documents}}\TecmoKoei\{{LocalizedPath|Dynasty Warriors 8}}\inputmap*.dat}}
+      8}}\|{{p|userprofile\Documents}}\TecmoKoei\{{LocalizedPath|Dynasty Warriors 8}}\inputmap*.dat}}
     - >-
       {{Game data/saves|Windows|{{p|userprofile\Documents}}\TecmoKoei\{{LocalizedPath|Dynasty Warriors
       8}}\Savedata\save.dat}}
 Dynasty Warriors 9:
   pageId: 83036
   steam: 730310
+  steamSide:
+    - 776520
+    - 776530
+    - 798860
+    - 798870
+    - 798880
+    - 835590
+    - 892390
+    - 892391
+    - 892392
+    - 892393
+    - 892394
+    - 892395
+    - 892396
+    - 892397
+    - 892398
+    - 892399
+    - 956700
+    - 956701
+    - 956702
+    - 956703
+    - 956704
+    - 956705
+    - 956706
+    - 956707
+    - 956708
+    - 956709
+    - 956720
+    - 956721
+    - 956722
+    - 956723
+    - 956724
+    - 956725
+    - 956726
+    - 956727
+    - 956728
+    - 956729
+    - 956730
+    - 956731
+    - 956732
+    - 956733
+    - 956734
+    - 956735
+    - 956736
+    - 956737
+    - 956738
+    - 956739
+    - 956750
+    - 956751
+    - 956752
+    - 956753
+    - 956760
+    - 956761
+    - 956762
+    - 956763
+    - 956764
+    - 956765
+    - 956766
+    - 956767
+    - 956768
+    - 956769
+    - 956770
+    - 956771
+    - 956772
+    - 956860
+    - 956861
+    - 956862
+    - 956863
+    - 956864
+    - 956865
+    - 956866
+    - 956867
+    - 956868
+    - 956869
+    - 956890
+    - 956891
+    - 956892
+    - 956893
+    - 956894
+    - 956895
+    - 956896
+    - 956897
+    - 956898
+    - 956899
+    - 956920
+    - 956921
+    - 956922
+    - 956923
+    - 956924
+    - 956930
+    - 956940
+    - 956941
+    - 956942
+    - 956943
+    - 956944
+    - 956945
+    - 956946
+    - 956947
+    - 956948
+    - 956949
+    - 962300
+    - 962301
+    - 962302
+    - 962303
+    - 962304
+    - 962305
+    - 962306
+    - 963070
+    - 964930
+    - 964931
+    - 964932
+    - 964933
+    - 964934
+    - 964935
+    - 964936
+    - 964937
+    - 964938
+    - 978850
+    - 978851
+    - 978852
+    - 978853
+    - 978854
+    - 978855
+    - 978856
+    - 978857
+    - 978858
+    - 978859
+    - 978860
+    - 978861
+    - 978862
+    - 978863
+    - 978864
+    - 978865
+    - 978866
+    - 978867
+    - 1019960
+    - 1019961
+    - 1019962
+    - 1019963
+    - 1019964
+    - 1019965
+    - 1019966
+    - 1019967
+    - 1019968
+    - 1019969
+    - 1019970
+    - 1019971
+    - 1019980
+    - 1019981
+    - 1019982
+    - 1019983
+    - 1019984
+    - 1019985
+    - 1019986
+    - 1019987
+    - 1019988
+    - 1019989
+    - 1019990
+    - 1019991
+    - 1019992
+    - 1019993
+    - 1019994
+    - 1052520
+    - 1094180
+    - 1094181
+    - 1094182
+    - 1094183
+    - 1094184
+    - 1094185
+    - 1094186
+    - 1094187
+    - 1246840
+    - 1246841
+    - 1246842
+    - 1246843
   templates:
     - >-
       {{Game data/config|Windows|{{p|hkcu}}\Software\KoeiTecmo\Dynasty Warriors 9 for
-      Steam\*||{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 9\SYSTEMDATA\sinpmap.dat}}
+      Steam\|{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 9\SYSTEMDATA\sinpmap.dat}}
     - '{{Game data/saves|Windows|{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 9 for Steam\*.*}}'
 'Dynasty Warriors 9: Empires':
   pageId: 163897
   steam: 1341200
+  steamSide:
+    - 1684140
+    - 1684141
+    - 1684146
+    - 1684147
+    - 1684148
+    - 1684149
+    - 1684150
+    - 1684151
+    - 1684152
+    - 1684153
+    - 1684154
+    - 1684155
+    - 1684156
+    - 1684157
+    - 1684158
+    - 1684159
+    - 1684160
+    - 1684161
+    - 1684162
+    - 1684163
+    - 1684164
+    - 1684165
+    - 1684166
   templates:
     - >-
-      {{Game data/config|Windows|{{p|hkcu}}\Software\KoeiTecmo\Dynasty Warriors 9 Empires for Steam
-      \*||{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 9 Empires\SYSTEMDATA\sinpmap.dat}}
+      {{Game data/config|Windows|{{p|hkcu}}\Software\KoeiTecmo\Dynasty Warriors 9 Empires for
+      Steam\|{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 9 Empires\SYSTEMDATA\sinpmap.dat}}
     - '{{Game data/saves|Windows|{{p|userprofile\Documents}}\KoeiTecmo\Dynasty Warriors 9 Empires\*.*}}'
 Dynasty Warriors Online Z:
   pageId: 173708
@@ -50843,7 +51089,7 @@ Earn to Die 2:
   pageId: 38212
   steam: 431590
   templates:
-    - '{{Game data/config|Windows|C:\Program Files (x86)\Steam\steamapps\common\Earn to Die 2\app.icf}}'
+    - '{{Game data/config|Windows|{{p|game}}\app.icf}}'
     - '{{Game data/saves|Windows|{{p|game}}\profile.dat}}'
 Ears of the Killer:
   pageId: 179132
@@ -103462,6 +103708,8 @@ Modbox:
 Model Builder:
   pageId: 151579
   steam: 1164250
+  templates:
+    - '{{Game data/saves|Windows|{{p|userprofile\Documents}}\Model Builder\Saves}}'
 Model DE Fight:
   pageId: 99456
   steam: 873370
@@ -157919,8 +158167,12 @@ Syberia II:
       Support/Syberia 2/}}
 'Syberia: The World Before':
   gog: 1731334260
+  gogSide:
+    - 1185739490
   pageId: 164170
   steam: 1410640
+  steamSide:
+    - 1421230
   templates:
     - '{{Game data/config|Windows|{{p|appdata}}\SyberiaTWB\}}'
     - '{{Game data/saves|Windows|{{p|appdata}}\SyberiaTWB\}}'