diff --git a/macOS.yaml b/macOS.yaml
index 01e26aa..e57001c 100644
--- a/macOS.yaml
+++ b/macOS.yaml
@@ -68,15 +68,13 @@ keymap:
   - name: Browser remaps
     application:
       only:
+        - Apple
         - Personal
-        - firefox
+        - Work
         - Firefox-esr
+        - firefox
     remap:
       # --- Navigation ---
-      # Back
-      Alt-LeftBrace: Ctrl-LeftBrace
-      # Forward
-      Alt-RightBrace: Ctrl-RightBrace
       # Reload
       Alt-R: Ctrl-R
       Alt-Shift-R: Ctrl-Shift-R
@@ -106,6 +104,10 @@ keymap:
         - Firefox-esr
     remap:
       # --- Navigation ---
+      # Back
+      Alt-LeftBrace: Ctrl-LeftBrace
+      # Forward
+      Alt-RightBrace: Ctrl-RightBrace
       # Open file
       Alt-O: Ctrl-O
 
@@ -188,11 +190,19 @@ keymap:
       # Focus Address Bar
       Alt-L: Ctrl-L
 
-  - name: Personal remaps
+  - name: WebCatalog remaps
     application:
-      only: Personal
+      only:
+        - Apple
+        - Personal
+        - Work
     remap:
       # Navigation
+      # Back
+      Alt-LeftBrace: Alt-Left
+      # Forward
+      Alt-RightBrace: Alt-Right
+      # Switch subspace
       Alt-1: Ctrl-1
       Alt-2: Ctrl-2
       Alt-3: Ctrl-3