diff --git a/data/manifest.yaml b/data/manifest.yaml
index 7d835f69..691969ee 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -881,6 +881,10 @@ $1 Ride:
   installDir:
     100 Orange Juice: {}
   launch:
+    "<base>/100OrangeJuice.app":
+      - when:
+          - os: mac
+            store: steam
     "<base>/100orange.exe":
       - when:
           - bit: 64
@@ -74862,22 +74866,22 @@ BioShock 2 Remastered:
     gog: true
     steam: true
   files:
-    "<winAppData>/Bioshock Epic HD/Bioshock2/*.ini":
-      tags:
-        - config
-      when:
-        - os: windows
     "<winAppData>/BioshockHD/Bioshock2/*.ini":
       tags:
         - config
       when:
         - os: windows
-    "<winDocuments>/Bioshock Epic HD/Bioshock2/<storeUserId>/SaveGames":
+    "<winAppData>/My games/Bioshock Epic HD/Bioshock2/*.ini":
+      tags:
+        - config
+      when:
+        - os: windows
+    "<winDocuments>/BioshockHD/Bioshock2/SaveGames":
       tags:
         - save
       when:
         - os: windows
-    "<winDocuments>/BioshockHD/Bioshock2/SaveGames":
+    "<winDocuments>/My Games/Bioshock Epic HD/Bioshock2/<storeUserId>/SaveGames":
       tags:
         - save
       when:
@@ -123465,6 +123469,23 @@ Clash of the Monsters:
             store: steam
   steam:
     id: 2318310
+"Class of Heroes: Anniversary Edition":
+  cloud:
+    steam: true
+  files:
+    "<winAppData>/Class of Heroes/*.dat":
+      when:
+        - store: steam
+  installDir:
+    Class of Heroes: {}
+  launch:
+    "<base>/Totomono1.exe":
+      - when:
+          - bit: 64
+            os: windows
+            store: steam
+  steam:
+    id: 2195780
 ClassiCube:
   cloud:
     steam: true
diff --git a/data/steam-game-cache.yaml b/data/steam-game-cache.yaml
index bfb6d02f..988c98af 100644
--- a/data/steam-game-cache.yaml
+++ b/data/steam-game-cache.yaml
@@ -47461,13 +47461,39 @@
 282800:
   cloud:
     saves:
+      - path: "FBF/100OrangeJuice/save/{64BitSteamID}/."
+        pattern: "*.ojs"
+        platforms:
+          - MacOS
+        recursive: true
+        root: MacAppSupport
       - path: "."
         pattern: user.dat
+        platforms:
+          - Windows
         root: gameinstall
       - path: "save/{64BitSteamID}/."
         pattern: "*.ojs"
+        platforms:
+          - Windows
         recursive: true
         root: gameinstall
+      - path: "."
+        pattern: user.dat
+        platforms:
+          - Linux
+        root: gameinstall
+      - path: "save/{64BitSteamID}/."
+        pattern: "*.ojs"
+        platforms:
+          - Linux
+        recursive: true
+        root: gameinstall
+      - path: FBF/100OrangeJuice/.
+        pattern: user.dat
+        platforms:
+          - MacOS
+        root: MacAppSupport
   installDir: 100 Orange Juice
   launch:
     - config:
@@ -47484,6 +47510,10 @@
         oslist: linux
       description: Launch
       executable: 100orange.sh
+    - config:
+        oslist: macos
+      description: Launch
+      executable: 100OrangeJuice.app
   nameLocalized:
     japanese: 100％おれんじじゅ～すっ！
 282860:
@@ -586632,6 +586662,21 @@
     - config:
         oslist: windows
       executable: theocracy.exe
+2195780:
+  cloud:
+    saves:
+      - path: Class of Heroes
+        pattern: "*.dat"
+        root: WinAppDataRoaming
+  installDir: Class of Heroes
+  launch:
+    - config:
+        osarch: "64"
+        oslist: windows
+      executable: Totomono1.exe
+      type: default
+  nameLocalized:
+    japanese: 剣と魔法と学園モノ。Anniversary Edition
 2196170:
   installDir: Clad in Iron Chincha Islands 1866
   launch:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index 27845cf7..237bea4a 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -23726,9 +23726,9 @@ BioShock 2 Remastered:
     - 525720
   templates:
     - "{{Game data/config|Windows|{{p|appdata}}\\BioshockHD\\Bioshock2\\*.ini}}"
-    - "{{Game data/config|Epic Games Launcher|{{p|appdata}}\\Bioshock Epic HD\\Bioshock2\\*.ini}}"
+    - "{{Game data/config|Epic Games Launcher|{{p|appdata}}\\My games\\Bioshock Epic HD\\Bioshock2\\*.ini}}"
     - "{{Game data/saves|Windows|{{p|userprofile\\Documents}}\\BioshockHD\\Bioshock2\\SaveGames\\}}"
-    - "{{Game data/saves|Epic Games Launcher|{{p|userprofile\\Documents}}\\Bioshock Epic HD\\Bioshock2\\{{p|uid}}\\SaveGames\\}}"
+    - "{{Game data/saves|Epic Games Launcher|{{p|userprofile\\Documents}}\\My Games\\Bioshock Epic HD\\Bioshock2\\{{p|uid}}\\SaveGames\\}}"
 BioShock Infinite:
   cloud:
     gog: true
@@ -39015,6 +39015,11 @@ Clash of the Monsters:
   steam: 2318310
   templates:
     - "{{Game data/saves|Windows|{{P|game}}\\C09RU-1.0\\game\\saves\\}}"
+"Class of Heroes: Anniversary Edition":
+  cloud:
+    steam: true
+  pageId: 200086
+  steam: 2195780
 ClassiCube:
   cloud:
     steam: true