diff --git a/data/manifest.yaml b/data/manifest.yaml
index 929ac3e6..dbf03067 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -274768,14 +274768,18 @@ Go Home Annie:
     epic: true
     steam: true
   files:
-    "<winDocuments>/Go Home Annie/Saves/Steam/<storeUserId>/*.save":
+    "<winDocuments>/Go Home Annie":
+      tags:
+        - config
+      when:
+        - os: windows
+    "<winDocuments>/Go Home Annie/Saves/Steam/<storeUserId>":
+      tags:
+        - save
       when:
         - os: windows
-          store: steam
   gog:
     id: 1913376893
-  id:
-    lutris: go-home-annie
   installDir:
     Go Home Annie: {}
   launch:
@@ -342034,6 +342038,8 @@ Jet Set Radio:
       when:
         - os: windows
           store: steam
+  id:
+    lutris: jet-set-radio
   installDir:
     Jet Set Radio: {}
   launch:
@@ -444994,6 +445000,30 @@ Nihilumbra:
             store: steam
   steam:
     id: 296550
+"Nikoderiko: The Magical World":
+  cloud:
+    steam: true
+  files:
+    "<winLocalAppData>/Nikoderiko/Saved/Config/WindowsNoEditor":
+      tags:
+        - config
+      when:
+        - os: windows
+    "<winLocalAppData>/Nikoderiko/Saved/SaveGames":
+      tags:
+        - config
+        - save
+      when:
+        - os: windows
+  installDir:
+    Nikoderiko The Magical World: {}
+  launch:
+    "<base>/Nikoderiko.exe":
+      - when:
+          - os: windows
+            store: steam
+  steam:
+    id: 2374190
 "Nikopol: Secrets of the Immortals":
   files:
     "<base>/config.ini":
@@ -590512,6 +590542,8 @@ Sonic Omens:
         - save
       when:
         - os: windows
+  id:
+    lutris: sonic-omens
 Sonic Origins:
   cloud:
     epic: true
@@ -759185,11 +759217,6 @@ Wildfrost:
     lutris: wildfrost
   installDir:
     Wildfrost: {}
-  launch:
-    "<base>/Wildfrost.exe":
-      - when:
-          - os: windows
-            store: steam
   steam:
     id: 1811990
 Wildland:
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index dd2809bb..87ff98c5 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -570501,17 +570501,10 @@
   launch:
     - config:
         oslist: windows
-      description: Play Wildfrost
+      description: Wildfrost
       executable: Wildfrost.exe
-      type: default
-    - config:
-        betakey: modding
-        oslist: windows
-      description: Wildfrost With Mods
-      executable: Modded/Wildfrost.exe
       type: option1
     - config:
-        betakey: modding-1.1.1
         oslist: windows
       description: Wildfrost With Mods
       executable: Modded/Wildfrost.exe
@@ -591302,6 +591295,21 @@
     koreana: "나 혼자만 레벨업:어라이즈"
     schinese: "我独自升级:起立"
     tchinese: "我獨自升級:Arise"
+2374190:
+  cloud:
+    saves:
+      - path: "Nikoderiko\\Saved\\SaveGames"
+        pattern: Game*.sav
+        platforms:
+          - Windows
+        root: WinAppDataLocal
+  installDir: Nikoderiko The Magical World
+  launch:
+    - config:
+        oslist: windows
+      description: Launch
+      executable: Nikoderiko.exe
+      type: default
 2375550:
   cloud:
     saves:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 3f94b94d..71f905d0 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -87090,9 +87090,11 @@ Go Home Annie:
     epic: true
     steam: true
   gog: 1913376893
-  lutris: go-home-annie
   pageId: 200046
   steam: 1939100
+  templates:
+    - "{{Game data/config|Windows|{{P|userprofile\\Documents}}\\Go Home Annie\\}}"
+    - "{{Game data/saves|Windows|{{P|userprofile\\Documents}}\\Go Home Annie\\Saves\\Steam\\{{P|uid}}\\}}"
 Go Home Dinosaurs!:
   pageId: 37479
   steam: 216090
@@ -108513,6 +108515,7 @@ Jet Set Knights:
 Jet Set Radio:
   cloud:
     steam: true
+  lutris: jet-set-radio
   pageId: 13442
   steam: 205950
   templates:
@@ -141754,6 +141757,14 @@ Nihilumbra:
   steam: 296550
   steamSide:
     - 361500
+"Nikoderiko: The Magical World":
+  cloud:
+    steam: true
+  pageId: 200056
+  steam: 2374190
+  templates:
+    - "{{Game data/config|Windows|{{P|localappdata}}\\Nikoderiko\\Saved\\Config\\WindowsNoEditor\\|{{P|localappdata}}\\Nikoderiko\\Saved\\SaveGames\\}}"
+    - "{{Game data/saves|Windows|{{P|localappdata}}\\Nikoderiko\\Saved\\SaveGames\\}}"
 "Nikopol: Secrets of the Immortals":
   gog: 1421047985
   pageId: 41257
@@ -187935,6 +187946,7 @@ Sonic Mega Collection Plus:
 Sonic Nexus:
   pageId: 177182
 Sonic Omens:
+  lutris: sonic-omens
   pageId: 198819
   templates:
     - "{{Game data/config|Windows|{{P|localappdata}}\\Sonic_Omens\\Saved\\Config\\WindowsNoEditor\\}}"
@@ -242743,6 +242755,7 @@ Wildfire Worlds:
 Wildfrost:
   cloud:
     steam: true
+    xbox: true
   lutris: wildfrost
   pageId: 187397
   steam: 1811990