diff --git a/data/manifest.yaml b/data/manifest.yaml
index c2643d96..67db4ae1 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -108634,6 +108634,10 @@ Combat master:
       - when:
           - os: linux
             store: steam
+  registry:
+    HKEY_CURRENT_USER/SOFTWARE/AlfaBravoInc/Combat Master:
+      tags:
+        - config
   steam:
     id: 2281730
 "Combat: Task Force 121":
@@ -602194,6 +602198,36 @@ Unclaimed World:
 Uncompromising Trash:
   steam:
     id: 588420
+Unconnected Marketeers:
+  files:
+    "<winAppData>/ShanghaiAlice/th18/replay":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<winAppData>/ShanghaiAlice/th18/scoreth18.dat":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<winAppData>/ShanghaiAlice/th18/snapshot":
+      tags:
+        - save
+      when:
+        - os: windows
+    "<winAppData>/ShanghaiAlice/th18/th18.cfg":
+      tags:
+        - config
+      when:
+        - os: windows
+  installDir:
+    th18: {}
+  launch:
+    "<base>/th18.exe":
+      - when:
+          - store: steam
+  steam:
+    id: 1566410
 Unconventional Warfare:
   installDir:
     Unconventional Warfare: {}
diff --git a/data/missing.md b/data/missing.md
index c6e711f8..18c9981e 100644
--- a/data/missing.md
+++ b/data/missing.md
@@ -6299,7 +6299,6 @@
 * [Combat Force](https://www.pcgamingwiki.com/wiki/?curid=150832)
 * [Combat Helicopter VR - Surgical Strike](https://www.pcgamingwiki.com/wiki/?curid=136502)
 * [Combat Instinct](https://www.pcgamingwiki.com/wiki/?curid=73465)
-* [Combat master](https://www.pcgamingwiki.com/wiki/?curid=188279)
 * [Combat Medic: Special Ops](https://www.pcgamingwiki.com/wiki/?curid=94987)
 * [Combat Mission 3: Afrika Korps](https://www.pcgamingwiki.com/wiki/?curid=138118)
 * [Combat Mission Cold War](https://www.pcgamingwiki.com/wiki/?curid=173027)
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index 1f3d5d45..b5f955c7 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -156572,20 +156572,36 @@
         oslist: windows
       executable: FSD.exe
       type: default
+    - config:
+        betakey: drg_legacy
+        osarch: "64"
+        oslist: windows
+      description: 2018 Legacy Edition
+      executable: Legacy/FSD.exe
+      type: option1
     - arguments: "-nohmd -dx12"
       config:
         osarch: "64"
         oslist: windows
       description: Deep Rock Galactic (DirectX 12)
       executable: FSD.exe
-      type: option1
+      type: option2
     - arguments: "-nohmd -dx11"
       config:
         osarch: "64"
         oslist: windows
       description: Deep Rock Galactic (DirectX 11)
       executable: FSD.exe
-      type: option2
+      type: option3
+    - arguments: "-nohmd -disablemodding -fsdsafemode -ngxdisable"
+      config:
+        osarch: "64"
+        oslist: windows
+      description: Deep Rock Galactic (Safe Mode)
+      executable: FSD.exe
+      type: option3
+  nameLocalized:
+    schinese: 深岩银河
 548450:
   installDir: Foreveracers
   launch:
@@ -422158,6 +422174,18 @@
   launch:
     - executable: SoD_SH.exe
       type: none
+1566410:
+  installDir: th18
+  launch:
+    - description: Playing Touhou Kouryudou
+      executable: th18.exe
+      type: default
+    - description: Game Setting
+      executable: custom.exe
+      type: config
+  nameLocalized:
+    english: Touhou Kouryudou ~ Unconnected Marketeers.
+    japanese: 東方虹龍洞 ～ Unconnected Marketeers.
 1566880:
   nameLocalized:
     japanese: ソードアート・オンライン ラスト リコレクション
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 41eff4f9..c2184c7e 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -32337,6 +32337,8 @@ Combat Tested:
 Combat master:
   pageId: 188279
   steam: 2281730
+  templates:
+    - "{{Game data/config|Windows|{{p|hkcu}}\\SOFTWARE\\AlfaBravoInc\\Combat Master}}"
 "Combat: Task Force 121":
   pageId: 187805
   templates:
@@ -180393,6 +180395,12 @@ Unclaimed World:
 Uncompromising Trash:
   pageId: 57896
   steam: 588420
+Unconnected Marketeers:
+  pageId: 192262
+  steam: 1566410
+  templates:
+    - "{{Game data/config|Windows|{{p|appdata}}\\ShanghaiAlice\\th18\\th18.cfg}}"
+    - "{{Game data/saves|Windows|{{p|appdata}}\\ShanghaiAlice\\th18\\scoreth18.dat | {{p|appdata}}\\ShanghaiAlice\\th18\\replay | {{p|appdata}}\\ShanghaiAlice\\th18\\snapshot}}"
 Unconventional Warfare:
   pageId: 139610
   steam: 831110