diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index bd6ff4059..8bfbb26f2 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -26,33 +26,6 @@
 ;;
 ;; Global keybindings
 
-(define-key!
-  ;; Buffer-local font scaling
-  "M-+" (λ! (text-scale-set 0))
-  "M-=" #'text-scale-increase
-  "M--" #'text-scale-decrease
-  ;; Simple window/frame navigation/manipulation
-  "M-w" #'delete-window
-  "M-W" #'delete-frame
-  "M-n" #'+default/new-buffer
-  "M-N" #'make-frame
-  ;; Restore OS undo, save, copy, & paste keys (without cua-mode, because
-  ;; it imposes some other functionality and overhead we don't need)
-  "M-z" #'undo
-  "M-s" #'save-buffer
-  "M-c" (if (featurep 'evil) 'evil-yank 'copy-region-as-kill)
-  "M-v" #'yank
-  ;; Textmate-esque bindings
-  "M-a" #'mark-whole-buffer
-  "M-b" #'+default/compile
-  "M-f" #'swiper
-  "M-q" (if (daemonp) #'delete-frame #'evil-quit-all)
-  ;; textmate-esque newline insertion
-  [M-return]    #'evil-open-below
-  [M-S-return]  #'evil-open-above
-  ;; textmate-esque deletion
-  [M-backspace] #'doom/backward-kill-to-bol-and-indent)
-
 (map! (:map override
         ;; A little sandbox to run code in
         "A-;" #'eval-expression
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 1ca56b1b5..cab5e16d9 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -131,8 +131,30 @@
 (when IS-MAC
   ;; Fix MacOS shift+tab
   (define-key input-decode-map [S-iso-lefttab] [backtab])
-  ;; Fix frame-switching key on MacOS
-  (global-set-key (kbd "M-`") #'other-frame))
+  ;; Fix conventional OS keys in Emacs
+  (map! "s-`" #'other-frame  ; fix frame-switching
+        ;; fix OS window/frame navigation/manipulation keys
+        "s-w" #'delete-window
+        "s-W" #'delete-frame
+        "s-n" #'+default/new-buffer
+        "s-N" #'make-frame
+        "s-q" (if (daemonp) #'delete-frame #'evil-quit-all)
+        ;; Restore OS undo, save, copy, & paste keys (without cua-mode, because
+        ;; it imposes some other functionality and overhead we don't need)
+        "s-z" #'undo
+        "s-c" (if (featurep 'evil) #'evil-yank #'copy-region-as-kill)
+        "s-v" #'yank
+        "s-s" #'save-buffer
+        ;; Buffer-local font scaling
+        "s-+" (λ! (text-scale-set 0))
+        "s-=" #'text-scale-increase
+        "s--" #'text-scale-decrease
+        ;; Conventional text-editing keys
+        "s-a" #'mark-whole-buffer
+        :gi [s-return]    #'+default/newline-below
+        :gi [s-S-return]  #'+default/newline-above
+        :gi [s-backspace] #'doom/backward-kill-to-bol-and-indent))
+
 
 ;;
 ;; Doom's keybinding scheme