diff --git a/data/manifest.yaml b/data/manifest.yaml
index d0d0897c..7e48cbdd 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -195184,6 +195184,8 @@ Dreamkiller:
         - save
       when:
         - os: windows
+  id:
+    lutris: dreamkiller
   installDir:
     Dreamkiller: {}
   launch:
@@ -237839,7 +237841,7 @@ Fate/EXTELLA:
         - config
       when:
         - os: windows
-    "<root>/userdata/\"SteamUserID\"/622220/remote/savedata/LINKSAVEDATA.bin":
+    "<root>/userdata/<storeUserId>/622220/remote/savedata/LINKSAVEDATA.bin":
       tags:
         - save
       when:
@@ -237864,7 +237866,7 @@ Fate/EXTELLA:
         - config
       when:
         - store: steam
-    "<root>/userdata/\"SteamUserID\"/511680/remote/savedata/FESAVSYSTEM.bin":
+    "<root>/userdata/<storeUserId>/511680/remote/savedata/FESAVSYSTEM.bin":
       tags:
         - save
       when:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 0a51459b..f6e0c01a 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -61818,6 +61818,7 @@ Dreaming Sarah:
   templates:
     - "{{Game data/saves|Windows|{{p|game}}\\save.json}}"
 Dreamkiller:
+  lutris: dreamkiller
   pageId: 88635
   steam: 24500
   templates:
@@ -75785,7 +75786,7 @@ Fate of the World:
   steam: 622220
   templates:
     - "{{Game data/config|Windows|{{p|game}}\\win_config.ini}}"
-    - "{{Game data/saves|Windows|{{P|steam}}/userdata/\"SteamUserID\"/622220/remote/savedata/LINKSAVEDATA.bin}}"
+    - "{{Game data/saves|Windows|{{P|steam}}/userdata/{{p|uid}}/622220/remote/savedata/LINKSAVEDATA.bin}}"
 "Fate/Extella: The Umbral Star":
   cloud:
     steam: true
@@ -75795,7 +75796,7 @@ Fate of the World:
   steam: 511680
   templates:
     - "{{Game data/config|Steam|{{p|game}}/win_config.ini}}"
-    - "{{Game data/saves|Windows|{{P|steam}}/userdata/\"SteamUserID\"/511680/remote/savedata/FESAVSYSTEM.bin}}"
+    - "{{Game data/saves|Windows|{{P|steam}}/userdata/{{p|uid}}/511680/remote/savedata/FESAVSYSTEM.bin<ref>{{Refurl|url=https://www.reddit.com/r/fateextella/comments/6r1s4k/where_is_the_save_data_file/|title=Where is the Save Data file?|date=2017-08-02}}</ref>}}"
 Fate/Hollow Ataraxia:
   pageId: 164556
   renamedFrom: