diff --git a/macOS.yaml b/macOS.yaml
index 2f06e88..6df7b93 100644
--- a/macOS.yaml
+++ b/macOS.yaml
@@ -1,36 +1,240 @@
 ---
-modmap:
-  - name: non-terminal modmap
-    application:
-      not:
-        - kitty
-        - gnome-terminal-server
-    remap:
-      LeftAlt: LeftCtrl
-      LeftCtrl: LeftAlt
-
 keymap:
-  - name: terminal remaps
+  - name: Terminal remaps
     application:
       only:
         - kitty
         - gnome-terminal-server
     remap:
+      # --- Editing ---
+      # Copy
       Alt-C: Ctrl-Shift-C
+      # Paste
       Alt-V: Ctrl-Shift-V
 
-  - name: non-terminal remaps
+  - name: Non-Terminal remaps
     application:
       not:
         - kitty
         - gnome-terminal-server
     remap:
-      # TODO: This is the main flaw of swapping Ctrl and Alt as it makes
-      # switching windows inconsistent and buggy.
-      Ctrl-Tab: Alt-Tab
+      # --- Editing ---
+      # Copy
+      Alt-C: Ctrl-C
+      # Cut
+      Alt-X: Ctrl-X
+      # Paste
+      Alt-V: Ctrl-V
+      # Select All
+      Alt-A: Ctrl-A
+      # Undo
+      Alt-Z: Ctrl-Z
 
-      Ctrl-Shift-LeftBrace: Ctrl-PageUp
-      Ctrl-Shift-RightBrace: Ctrl-PageDown
+      # --- Windows ---
+      # Quit
+      Alt-Q: Alt-F4
 
+      # TODO: Move cursor one word left/right
+      # Doesn't work for some reason
+      # Alt-Left: Ctrl-Left
+      # Alt-Right: Ctrl-Right
+
+  - name: Firefox remaps
+    application:
+      only: firefox
+    remap:
+      # --- Navigation ---
+      # Back
+      Alt-LeftBrace: Ctrl-LeftBrace
+      # Forward
+      Alt-RightBrace: Ctrl-RightBrace
+      # Open file
+      Alt-O: Ctrl-O
+      # Reload
+      Alt-R: Ctrl-R
+      Alt-Shift-R: Ctrl-Shift-R
+
+      # --- Current Page ---
+      # Go to Bottom of Page
+      Alt-Down: Ctrl-Down
+      # Go to Top of Page
+      Alt-Up: Ctrl-Up
+      # Print
+      Alt-P: Ctrl-P
+      # Save Page As
+      Alt-S: Ctrl-S
+      # Zoom In
+      Alt-Shift-Equal: Ctrl-Shift-Equal
+      Alt-Equal: Ctrl-Equal
+      # Zoom Out
+      Alt-Minus: Ctrl-Minus
+      # Zoom Reset
+      Alt-0: Ctrl-0
+
+      # --- Editing ---
+      # Paste (as plain text)
+      Alt-Shift-V: Ctrl-Shift-V
+
+      # --- Search ---
+      # Find
+      Alt-F: Ctrl-F
+      # Find Again
+      Alt-G: Ctrl-G
+      # Find Previous
+      Alt-Shift-G: Ctrl-Shift-G
+      # Switch Search Engine
+      Ctrl-Up: Alt-Up
+      Ctrl-Down: Alt-Down
+      # Focus Address Bar with Default Search Engine
+      Alt-K: Ctrl-K
+
+      # --- Windows & Tabs ---
+      # Close Tab
+      Alt-W: Ctrl-W
+      # Close Window
+      Alt-Shift-W: Ctrl-Shift-W
+      # Quit
+      Alt-Q: Ctrl-Q
+      # Go one Tab to the Left
+      Alt-Shift-LeftBrace: Ctrl-PageUp
+      # Go one Tab to the right
+      Alt-Shift-RightBrace: Ctrl-PageDown
+      # Move Tab Left
       Ctrl-Alt-Shift-LeftBrace: Ctrl-Shift-PageUp
+      # Move Tab Right
       Ctrl-Alt-Shift-RightBrace: Ctrl-Shift-PageDown
+      # Move Tab to start
+      Alt-Shift-Home: Ctrl-Shift-Home
+      # Move Tab to end
+      Alt-Shift-End: Ctrl-Shift-End
+      # New Tab
+      Alt-T: Ctrl-T
+      # New Window
+      Alt-N: Ctrl-N
+      # New Private Window
+      Alt-Shift-P: Ctrl-Shift-P
+      # Undo Close Tab
+      Alt-Shift-T: Ctrl-Shift-T
+      # Undo Close Window
+      Alt-Shift-N: Ctrl-Shift-N
+
+      # --- History ---
+      # History Sidebar
+      Alt-Shift-H: Ctrl-Shift-H
+      # Clear Recent History
+      Alt-Shift-Delete: Ctrl-Shift-Delete
+
+      # --- Bookmarks ---
+      # Bookmark this page
+      Alt-D: Ctrl-D
+      # Bookmark sidebar
+      Alt-B: Ctrl-B
+      # Show/hide the Bookmark toolbar
+      Alt-Shift-B: Ctrl-Shift-B
+      # Show all Bookmarks
+      Alt-Shift-O: Ctrl-Shift-O
+
+      # --- Tools ---
+      # Downloads
+      Alt-J: Ctrl-Shift-Y
+      # Add-ons
+      Alt-Shift-A: Ctrl-Shift-A
+      # Toggle Developer Tools
+      Alt-Shift-I: Ctrl-Shift-I
+      # Web Console
+      Alt-Shift-K: Ctrl-Shift-K
+      # Interceptor
+      Alt-Shift-C: Ctrl-Shift-C
+      # Take a screenshot
+      Alt-Shift-S: Ctrl-Shift-S
+      # Network
+      Alt-Shift-E: Ctrl-Shift-E
+      # Responsive Design View
+      Alt-Shift-M: Ctrl-Shift-M
+      # Page Source
+      Alt-U: Ctrl-U
+      # Browser Console
+      Alt-Shift-J: Ctrl-Shift-J
+      # Page Info
+      Alt-I: Ctrl-I
+
+      # --- Miscellaneous ---
+      # Fullscreen
+      Alt-Shift-F: F11
+      # Focus Address Bar
+      Alt-L: Ctrl-L
+
+  - name: Personal remaps
+    application:
+      only: Personal
+    remap:
+      Alt-1: Ctrl-1
+      Alt-2: Ctrl-2
+      Alt-3: Ctrl-3
+      Alt-4: Ctrl-4
+      Alt-5: Ctrl-5
+      Alt-6: Ctrl-6
+      Alt-7: Ctrl-7
+      Alt-8: Ctrl-8
+      Alt-9: Ctrl-9
+
+  - name: 1Password remaps
+    application:
+      only: 1Password
+    remap:
+      # --- Basics ---
+      # View Keyboard Shortcuts
+      Alt-Shift-Slash: Ctrl-Shift-Slash
+      # Lock 1Password
+      Alt-Shift-L: Ctrl-Shift-L
+
+      # --- Navigation ---
+      # Find
+      Alt-F: Ctrl-F
+      # Switch to All Accounts
+      Alt-1: Ctrl-1
+      # Switch Accounts & Collections
+      Alt-2: Ctrl-2
+      Alt-3: Ctrl-3
+      Alt-4: Ctrl-4
+      Alt-5: Ctrl-5
+      Alt-6: Ctrl-6
+      Alt-7: Ctrl-7
+      Alt-8: Ctrl-8
+      Alt-9: Ctrl-9
+      # Back
+      Alt-LeftBrace: Ctrl-Left
+      # Forward
+      Alt-RightBrace: Ctrl-Right
+
+      # --- Selected Item ---
+      # Copy Primary Field
+      Alt-C: Ctrl-C
+      # Copy Password
+      Alt-Shift-C: Ctrl-Shift-C
+      # Copy One-Time Password
+      Alt-LeftMeta-C: Ctrl-Alt-C
+      # Open & Fill in Web Browser
+      Alt-Shift-F: Ctrl-Shift-F
+      # Open Item in New Window
+      Alt-O: Ctrl-O
+      # Open in 1Password
+      Alt-Shift-O: Ctrl-Shift-O
+      # Edit Item
+      Alt-E: Ctrl-E
+      # Save Item
+      Alt-S: Ctrl-S
+      # Reveal Concealed Fields
+      Alt-R: Ctrl-R
+      # Delete Item
+      Alt-Delete: Ctrl-Delete
+
+      # --- View ---
+      # Show/Hide Sidebar
+      Alt-Shift-D: Ctrl-Shift-D
+      # Zoom In
+      Alt-Equal: Ctrl-Shift-Equal
+      # Zoom In
+      Alt-Minus: Ctrl-Minus
+      # Actual Size
+      Alt-0: Ctrl-0