diff --git a/core/core-os.el b/core/core-os.el
index cdaced36c..a7fd04298 100644
--- a/core/core-os.el
+++ b/core/core-os.el
@@ -15,8 +15,8 @@
   "Inject VARS from your shell environment into Emacs.")
 
 (cond (IS-MAC
-       (setq mac-command-modifier 'meta
-             mac-option-modifier  'alt
+       (setq mac-command-modifier 'super
+             mac-option-modifier  'meta
              ;; sane trackpad/mouse scroll settings
              mac-redisplay-dont-reset-vscroll t
              mac-mouse-wheel-smooth-scroll nil
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 1f320f49a..de2ccf508 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -19,7 +19,8 @@
 (map! (:map override
         ;; A little sandbox to run code in
         "M-;" #'eval-expression
-        "A-;" #'eval-expression)
+        "A-;" #'eval-expression
+        (:when IS-MAC "s-;" #'eval-expression))
 
       [remap evil-jump-to-tag] #'projectile-find-tag
       [remap find-tag]         #'projectile-find-tag
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 83507b5f4..08415884c 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -132,33 +132,33 @@
   ;; Fix MacOS shift+tab
   (define-key input-decode-map [S-iso-lefttab] [backtab])
   ;; Fix conventional OS keys in Emacs
-  (map! "M-`" #'other-frame  ; fix frame-switching
+  (map! "s-`" #'other-frame  ; fix frame-switching
         ;; fix OS window/frame navigation/manipulation keys
-        "M-w" #'delete-window
-        "M-W" #'delete-frame
-        "M-n" #'+default/new-buffer
-        "M-N" #'make-frame
-        "M-q" (if (daemonp) #'delete-frame #'evil-quit-all)
+        "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)
-        "M-z" #'undo
-        "M-c" (if (featurep 'evil) #'evil-yank #'copy-region-as-kill)
-        "M-v" #'yank
-        "M-s" #'save-buffer
+        "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
-        "M-+" (λ! (text-scale-set 0))
-        "M-=" #'text-scale-increase
-        "M--" #'text-scale-decrease
+        "s-+" (λ! (text-scale-set 0))
+        "s-=" #'text-scale-increase
+        "s--" #'text-scale-decrease
         ;; Conventional text-editing keys & motions
-        "M-a" #'mark-whole-buffer
-        :gi [M-return]    #'+default/newline-below
-        :gi [M-S-return]  #'+default/newline-above
-        :gi [M-backspace] #'doom/backward-kill-to-bol-and-indent
-        :gi [M-left]      #'doom/backward-to-bol-or-indent
-        :gi [M-right]     #'doom/forward-to-last-non-comment-or-eol
-        :gi [A-backspace] #'backward-kill-word
-        :gi [A-left]      #'backward-word
-        :gi [A-right]     #'forward-word))
+        "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
+        :gi [s-left]      #'doom/backward-to-bol-or-indent
+        :gi [s-right]     #'doom/forward-to-last-non-comment-or-eol
+        :gi [M-backspace] #'backward-kill-word
+        :gi [M-left]      #'backward-word
+        :gi [M-right]     #'forward-word))
 
 
 ;;