diff --git a/data/manifest.yaml b/data/manifest.yaml
index dd97c162..b831a4ea 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -105959,6 +105959,12 @@ Cocoon:
         - save
       when:
         - os: windows
+    "<winLocalAppData>/Packages/AnnapurnaInteractive.UniverseProject_c96c51jf6wkvm/SystemAppData/wgs/[userID]/[ID]":
+      tags:
+        - save
+      when:
+        - os: windows
+          store: microsoft
   installDir:
     Cocoon: {}
   launch:
@@ -180632,6 +180638,13 @@ Enola:
   steam:
     id: 263520
 Enshrouded:
+  files:
+    "<home>/Saved Games/Enshrouded":
+      tags:
+        - config
+      when:
+        - os: windows
+          store: steam
   installDir:
     Enshrouded: {}
   launch:
@@ -275989,6 +276002,12 @@ Infernum:
   steam:
     id: 998590
 Infestation (2000):
+  files:
+    "<base>/Infest.sav":
+      tags:
+        - save
+      when:
+        - os: windows
   registry:
     HKEY_CURRENT_USER/Software/Frontier Developments Ltd/Infestation:
       tags:
@@ -392451,20 +392470,24 @@ Paint Warfare:
   installDir:
     Paint Warfare: {}
   launch:
-    "<base>/Linux/Paint Warfare.x86_64":
+    "<base>/Paint Warfare.app":
       - when:
-          - bit: 64
-            os: linux
+          - os: mac
             store: steam
-    "<base>/Windows/Paint Warfare.exe":
+    "<base>/Paint Warfare.exe":
       - when:
           - bit: 64
             os: windows
             store: steam
-    "<base>/macOS/Paint Warfare.app":
+    "<base>/Paint Warfare.x86_64":
       - when:
-          - os: mac
+          - bit: 64
+            os: linux
             store: steam
+  registry:
+    HKEY_CURRENT_USER/Software/bananadev/Paint Warfare:
+      tags:
+        - config
   steam:
     id: 1190150
 Paint the Town Red:
@@ -646769,6 +646792,9 @@ Ys Seven:
       - arguments: "-nolauncher"
         when:
           - store: steam
+    "<base>/Ys7Launcher.exe":
+      - when:
+          - store: steam
   steam:
     id: 587100
 "Ys VI: The Ark of Napishtim":
@@ -646854,6 +646880,9 @@ Ys Seven:
   installDir:
     Ys Memories of Celceta: {}
   launch:
+    "<base>/YscLauncher.exe":
+      - when:
+          - store: steam
     "<base>/Ysc_dx11.exe":
       - when:
           - store: steam
diff --git a/data/missing.md b/data/missing.md
index 38db62e7..8e58bc2a 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -10201,7 +10201,6 @@
 * [Enlysia](https://www.pcgamingwiki.com/wiki/?curid=65033)
 * [Enoch: Underground](https://www.pcgamingwiki.com/wiki/?curid=69743)
 * [Enola](https://www.pcgamingwiki.com/wiki/?curid=49619)
-* [Enshrouded](https://www.pcgamingwiki.com/wiki/?curid=192570)
 * [Enshrouded World: Home Truths](https://www.pcgamingwiki.com/wiki/?curid=64823)
 * [Ensign-1](https://www.pcgamingwiki.com/wiki/?curid=49333)
 * [Entangle](https://www.pcgamingwiki.com/wiki/?curid=57333)
@@ -22551,7 +22550,6 @@
 * [Paint It Black](https://www.pcgamingwiki.com/wiki/?curid=88142)
 * [Paint Polygon](https://www.pcgamingwiki.com/wiki/?curid=67512)
 * [Paint Skills](https://www.pcgamingwiki.com/wiki/?curid=81522)
-* [Paint Warfare](https://www.pcgamingwiki.com/wiki/?curid=152791)
 * [Paintball 707](https://www.pcgamingwiki.com/wiki/?curid=54313)
 * [Paintball Chibis](https://www.pcgamingwiki.com/wiki/?curid=122510)
 * [Paintball eXtreme](https://www.pcgamingwiki.com/wiki/?curid=47223)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index fef72320..4bc430fc 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -18178,10 +18178,10 @@
     - arguments: /silent /startuptitle=SMStorm
       description: Play
       executable: ManiaPlanetLauncher.exe
-      workingdir: ".\\\\"
+      workingdir: ".\\"
     - description: Launcher
       executable: ManiaPlanetLauncher.exe
-      workingdir: ".\\\\"
+      workingdir: ".\\"
 229890:
   installDir: Joe Danger
   launch:
@@ -172932,8 +172932,8 @@
     - arguments: "-nolauncher"
       executable: Ys7.exe
       type: default
-    - executable: Ys7Launcher.exe
-      type: config
+    - description: Launch Configuration Tool
+      executable: Ys7Launcher.exe
   nameLocalized:
     japanese: イースSEVEN
 587110:
@@ -172941,8 +172941,8 @@
   launch:
     - executable: Ysc_dx11.exe
       type: none
-    - executable: YscLauncher.exe
-      type: config
+    - description: Launch Configuration Tool
+      executable: YscLauncher.exe
   nameLocalized:
     japanese: イース セルセタの樹海
 587160: {}
@@ -193330,13 +193330,13 @@
 644830:
   installDir: The Surge 2
   launch:
-    - executable: "bin\\\\TheSurge2.exe"
+    - executable: "bin\\TheSurge2.exe"
       type: none
-      workingdir: "\\\\bin"
+      workingdir: "\\bin"
     - description: Driver Checker (Beta)
-      executable: "launcher\\\\surge2-launcher.exe"
+      executable: "launcher\\surge2-launcher.exe"
       type: none
-      workingdir: "\\\\bin"
+      workingdir: "\\bin"
 644860:
   installDir: The Lightbringers
   launch:
@@ -396771,17 +396771,30 @@
     - config:
         osarch: "64"
         oslist: windows
-      executable: Windows/Paint Warfare.exe
-      type: none
+      executable: Paint Warfare.exe
     - config:
         oslist: macos
-      executable: macOS/Paint Warfare.app
-      type: none
+      executable: Paint Warfare.app
     - config:
         osarch: "64"
         oslist: linux
-      executable: Linux/Paint Warfare.x86_64
-      type: none
+      executable: Paint Warfare.x86_64
+  nameLocalized:
+    brazilian: Guerra de Paintball
+    dutch: " Paintball Gevecht"
+    french: Guerre de Paintball
+    german: Paintball Schlacht
+    greek: Πείντμπολ Μάχη
+    japanese: ペイントボールバトル
+    koreana: 페인트볼 전투
+    latam: Batalla de Paintball
+    polish: Operacja Paintball
+    portuguese: Guerra de Paintball
+    russian: "Операция: Пейнтбол"
+    schinese: 彩球战争
+    spanish: Batalla de Paintball
+    tchinese: 彩球戰爭
+    thai: การต่อสู้เพ้นท์บอล
 1190160:
   installDir: LIT Bend the Light
   launch:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 4014f6d9..c99848b6 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -31686,6 +31686,7 @@ Cocoon:
   templates:
     - "{{Game data/config|Windows|{{P|userprofile\\appdata\\locallow}}\\GeometricInteractive\\Cocoon\\}}"
     - "{{Game data/saves|Windows|{{P|userprofile\\appdata\\locallow}}\\GeometricInteractive\\Cocoon\\}}"
+    - "{{Game data/saves|Microsoft Store|{{P|localappdata}}\\Packages\\AnnapurnaInteractive.UniverseProject_c96c51jf6wkvm\\SystemAppData\\wgs\\[userID]\\[ID]\\<ref>{{Refcheck|user=Martan|date=2024-01-27|comment={{store feature|Xbox Game Pass}} version}}</ref>}}"
 Code 7:
   pageId: 65482
   steam: 650570
@@ -53775,6 +53776,9 @@ Enola:
 Enshrouded:
   pageId: 192570
   steam: 1203620
+  templates:
+    - "{{Game data/config|Steam|{{p|userprofile}}\\Saved Games\\Enshrouded\\ | {{p|game}}\\ }}"
+    - "{{Game data/saves|Steam|<Steam-folder>\\userdata\\<user-id>\\1203620\\remote\\}}"
 "Enshrouded World: Home Truths":
   pageId: 64823
   steam: 658440
@@ -82485,7 +82489,7 @@ Infestation (2000):
   pageId: 40389
   templates:
     - "{{Game data/config|Windows|{{p|hkcu}}\\Software\\Frontier Developments Ltd\\Infestation\\}}"
-    - "{{Game data/saves|Windows|{{p|game}}\\}}"
+    - "{{Game data/saves|Windows|{{p|game}}\\Infest.sav{{note|In some versions of the game, the save file will go in \"C:\\Program Files\\Infestation\\\" regardless of where the game is installed and run from.}}}}"
 Infestation World:
   pageId: 152301
 "Infestation: Germany":
@@ -117638,6 +117642,8 @@ Paint Skills:
 Paint Warfare:
   pageId: 152791
   steam: 1190150
+  templates:
+    - "{{Game data/config|Windows|{{P|hkcu}}\\Software\\bananadev\\Paint Warfare}}"
 Paint the Town Red:
   pageId: 37551
   steam: 337320