diff --git a/core/core-os.el b/core/core-os.el
index 2279e2491..6a45a20d6 100644
--- a/core/core-os.el
+++ b/core/core-os.el
@@ -65,15 +65,14 @@
 
       (IS-LINUX
        (setq x-gtk-use-system-tooltips nil    ; native tooltips are ugly!
-             x-underline-at-descent-line t    ; draw underline lower
-             x-alt-keysym 'meta))
+             x-underline-at-descent-line t))  ; draw underline lower
 
       (IS-WINDOWS
        (setq w32-get-true-file-attributes nil  ; fix file io slowdowns
-             ;; map window keys to super
+             ;; map window keys to super (unreliable)
              w32-pass-lwindow-to-system nil
-             w32-lwindow-modifier 'super
              w32-pass-rwindow-to-system nil
+             w32-lwindow-modifier 'super
              w32-rwindow-modifier 'super)
        (when (display-graphic-p)
          (setenv "GIT_ASKPASS" "git-gui--askpass"))))
diff --git a/modules/editor/parinfer/config.el b/modules/editor/parinfer/config.el
index 42c35dc73..fc24cb37a 100644
--- a/modules/editor/parinfer/config.el
+++ b/modules/editor/parinfer/config.el
@@ -13,7 +13,7 @@
   :config
   (map! :map parinfer-mode-map
         "\"" nil  ; smartparens handles this
-        :i "<tab>" #'parinfer-smart-tab:dwim-right-or-complete
+        :i "<tab>"     #'parinfer-smart-tab:dwim-right-or-complete
         :i "<backtab>" #'parinfer-smart-tab:dwim-left
         :localleader
-        :nv "m" #'parinfer-toggle-mode))
+        :desc "Toggle parinfer-mode" "m" #'parinfer-toggle-mode))
diff --git a/modules/lang/agda/config.el b/modules/lang/agda/config.el
index dc21ae25c..0ad69349d 100644
--- a/modules/lang/agda/config.el
+++ b/modules/lang/agda/config.el
@@ -13,26 +13,27 @@
   :config
   (map! :map agda2-mode-map
         :localleader
-        :n "?"  #'agda2-show-goals
-        :n "."  #'agda2-goal-and-context-and-inferred
-        :n ","   #'agda2-goal-and-context
-        :n "="   #'agda2-show-constraints
-        :n "SPC" #'agda2-give
-        :n "a"   #'agda2-auto
-        :n "c"   #'agda2-make-case
-        :n "d"   #'agda2-infer-type-maybe-toplevel
-        :n "e"   #'agda2-show-context
-        :n "gG"  #'agda2-go-back
-        :n "h"   #'agda2-helper-function-type
-        :n "l"   #'agda2-load
-        :n "n"  #'agda2-compute-normalised-maybe-toplevel
-        :n "p"  #'agda2-module-contents-maybe-toplevel
-        :n "r"  #'agda2-refine
-        :n "s"  #'agda2-solveAll
-        :n "t"  #'agda2-goal-type
-        :n "w"  #'agda2-why-in-scope-maybe-toplevel
-        :n "xc" #'agda2-compile
-        :n "xd" #'agda2-remove-annotations
-        :n "xh" #'agda2-display-implicit-arguments
-        :n "xq" #'agda2-quit
-        :n "xr" #'agda2-restart))
+        "?"   #'agda2-show-goals
+        "."   #'agda2-goal-and-context-and-inferred
+        ","   #'agda2-goal-and-context
+        "="   #'agda2-show-constraints
+        "SPC" #'agda2-give
+        "a"   #'agda2-auto
+        "c"   #'agda2-make-case
+        "d"   #'agda2-infer-type-maybe-toplevel
+        "e"   #'agda2-show-context
+        "gG"  #'agda2-go-back
+        "h"   #'agda2-helper-function-type
+        "l"   #'agda2-load
+        "n"   #'agda2-compute-normalised-maybe-toplevel
+        "p"   #'agda2-module-contents-maybe-toplevel
+        "r"   #'agda2-refine
+        "s"   #'agda2-solveAll
+        "t"   #'agda2-goal-type
+        "w"   #'agda2-why-in-scope-maybe-toplevel
+        (:prefix "x"
+          "c"   #'agda2-compile
+          "d"   #'agda2-remove-annotations
+          "h"   #'agda2-display-implicit-arguments
+          "q"   #'agda2-quit
+          "r"   #'agda2-restart)))
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index 4768bf219..792182d9e 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -44,64 +44,63 @@
           cider-stacktrace-default-filters '(tooling dup))
 
     ;; TODO: Add mode-local labels when general support is in.
-    (map! :localleader
-          (:map clojure-mode-map
-            :n  "'"  #'cider-jack-in
-            :n  "\"" #'cider-jack-in-clojurescript)
-          (:map cider-mode-map
-            ;; eval
-            (:prefix "e"
-              :n "d" #'cider-eval-defun-at-point
-              :n "D" #'cider-insert-defun-in-repl
-              :n "e" #'cider-eval-last-sexp
-              :n "E" #'cider-insert-last-sexp-in-repl
-              :n "r" #'cider-eval-region
-              :n "R" #'cider-insert-region-in-repl
-              :n "u" #'cider-undef)
-            ;; go/jump
-            (:prefix "g"
-              :n "b" #'cider-pop-back
-              :n "g" #'cider-find-var
-              :n "n" #'cider-find-ns)
-            ;; help
-            (:prefix "h"
-              :n "n" #'cider-find-ns
-              :n "a" #'cider-apropos
-              :n "d" #'cider-doc
-              :n "g" #'cider-grimoire-web
-              :n "j" #'cider-javadoc)
-            ;; inspect
-            (:prefix "i"
-              :n "i" #'cider-inspect
-              :n "r" #'cider-inspect-last-result)
-            ;; macro
-            (:prefix "m"
-              :n "e" #'cider-macroexpand-1
-              :n "E" #'cider-macroexpand-al)
-            ;; namespace
-            (:prefix "n"
-              :n "n" #'cider-browse-ns
-              :n "N" #'cider-browse-ns-all)
-            ;; repl
-            (:prefix "r"
-              :n "n" #'cider-repl-set-ns
-              :n "q" #'cider-quit
-              :n "r" #'cider-refresh
-              :n "R" #'cider-restart
-              :n "b" #'cider-switch-to-repl-buffer
-              :n "B" #'+clojure/cider-switch-to-repl-buffer-and-switch-ns
-              :n "c" #'cider-repl-clear-buffer)))
+    (map! (:localleader
+            (:map clojure-mode-map
+              "'"  #'cider-jack-in
+              "\"" #'cider-jack-in-clojurescript)
+            (:map cider-mode-map
+              ;; eval
+              (:prefix "e"
+                "d" #'cider-eval-defun-at-point
+                "D" #'cider-insert-defun-in-repl
+                "e" #'cider-eval-last-sexp
+                "E" #'cider-insert-last-sexp-in-repl
+                "r" #'cider-eval-region
+                "R" #'cider-insert-region-in-repl
+                "u" #'cider-undef)
+              ;; go/jump
+              (:prefix "g"
+                "b" #'cider-pop-back
+                "g" #'cider-find-var
+                "n" #'cider-find-ns)
+              ;; help
+              (:prefix "h"
+                "n" #'cider-find-ns
+                "a" #'cider-apropos
+                "d" #'cider-doc
+                "g" #'cider-grimoire-web
+                "j" #'cider-javadoc)
+              ;; inspect
+              (:prefix "i"
+                "i" #'cider-inspect
+                "r" #'cider-inspect-last-result)
+              ;; macro
+              (:prefix "m"
+                "e" #'cider-macroexpand-1
+                "E" #'cider-macroexpand-al)
+              ;; namespace
+              (:prefix "n"
+                "n" #'cider-browse-ns
+                "N" #'cider-browse-ns-all)
+              ;; repl
+              (:prefix "r"
+                "n" #'cider-repl-set-ns
+                "q" #'cider-quit
+                "r" #'cider-refresh
+                "R" #'cider-restart
+                "b" #'cider-switch-to-repl-buffer
+                "B" #'+clojure/cider-switch-to-repl-buffer-and-switch-ns
+                "c" #'cider-repl-clear-buffer)))
 
-    (when (featurep! :feature evil +everywhere)
-      (evil-define-key 'insert cider-repl-mode-map
-        [S-return] #'cider-repl-newline-and-indent)
-      (evil-define-key 'normal cider-repl-history-mode-map
-        "q" 'cider-repl-history-quit
-        [return] 'cider-repl-history-insert-and-quit
-        "l" 'cider-repl-history-occur
-        "s" 'cider-repl-history-search-forward
-        "r" 'cider-repl-history-search-backward
-        "U" 'cider-repl-history-undo-other-window)))
+          (:when (featurep! :feature evil +everywhere)
+            :map cider-repl-mode-map :i [S-return] #'cider-repl-newline-and-indent
+            :map cider-repl-history-mode-map
+            :i [return]  #'cider-repl-history-insert-and-quit
+            :i "q"  #'cider-repl-history-quit
+            :i "l"  #'cider-repl-history-occur
+            :i "s"  #'cider-repl-history-search-forward
+            :i "r"  #'cider-repl-history-search-backward
+            :i "U"  #'cider-repl-history-undo-other-window)))
 
   (def-package! clj-refactor
     :hook (clojure-mode . clj-refactor-mode)
diff --git a/modules/lang/common-lisp/config.el b/modules/lang/common-lisp/config.el
index e4ff02331..2bef0db59 100644
--- a/modules/lang/common-lisp/config.el
+++ b/modules/lang/common-lisp/config.el
@@ -76,65 +76,65 @@ bin/doom while packages at compile-time (not a runtime though)."
     (advice-remove #'sly-check-version #'+common-lisp*refresh-sly-version))
   (advice-add #'sly-check-version :before #'+common-lisp*refresh-sly-version)
 
-  (map! :map sly-mode-map
-        :localleader
-        :n "'" #'sly
+  (map! :localleader
+        :map sly-mode-map
+        "'" #'sly
         (:prefix "g"
-          :n "b" #'sly-pop-find-definition-stack
-          :n "d" #'sly-edit-definition
-          :n "D" #'sly-edit-definition-other-window
-          :n "n" #'sly-next-note
-          :n "N" #'sly-previous-note
-          :n "s" #'sly-stickers-next-sticker
-          :n "S" #'sly-stickers-prev-sticker)
+          "b" #'sly-pop-find-definition-stack
+          "d" #'sly-edit-definition
+          "D" #'sly-edit-definition-other-window
+          "n" #'sly-next-note
+          "N" #'sly-previous-note
+          "s" #'sly-stickers-next-sticker
+          "S" #'sly-stickers-prev-sticker)
         (:prefix "h"
-          :n "<" #'sly-who-calls
-          :n ">" #'sly-calls-who
-          :n "~" #'hyperspec-lookup-format
-          :n "#" #'hyperspec-lookup-reader-macro
-          :n "a" #'sly-apropos
-          :n "b" #'sly-who-binds
-          :n "d" #'sly-disassemble-symbol
-          :n "h" #'sly-describe-symbol
-          :n "H" #'sly-hyperspec-lookup
-          :n "m" #'sly-who-macroexpands
-          :n "p" #'sly-apropos-package
-          :n "r" #'sly-who-references
-          :n "s" #'sly-who-specializes
-          :n "S" #'sly-who-sets)
+          "<" #'sly-who-calls
+          ">" #'sly-calls-who
+          "~" #'hyperspec-lookup-format
+          "#" #'hyperspec-lookup-reader-macro
+          "a" #'sly-apropos
+          "b" #'sly-who-binds
+          "d" #'sly-disassemble-symbol
+          "h" #'sly-describe-symbol
+          "H" #'sly-hyperspec-lookup
+          "m" #'sly-who-macroexpands
+          "p" #'sly-apropos-package
+          "r" #'sly-who-references
+          "s" #'sly-who-specializes
+          "S" #'sly-who-sets)
         (:prefix "c"
-          :n "c" #'sly-compile-file
-          :n "C" #'sly-compile-and-load-file
-          :n "f" #'sly-compile-defun
-          :n "l" #'sly-load-file
-          :n "n" #'sly-remove-notes
-          :v "r" #'sly-compile-region)
+          "c" #'sly-compile-file
+          "C" #'sly-compile-and-load-file
+          "f" #'sly-compile-defun
+          "l" #'sly-load-file
+          "n" #'sly-remove-notes
+          "r" #'sly-compile-region)
         (:prefix "e"
-          :n "b" #'sly-eval-buffer
-          :n "e" #'sly-eval-last-expression
-          :n "E" #'sly-eval-print-last-expression
-          :n "f" #'sly-eval-defun
-          :n "F" #'sly-undefine-function
-          :v "r" #'sly-eval-region)
+          "b" #'sly-eval-buffer
+          "e" #'sly-eval-last-expression
+          "E" #'sly-eval-print-last-expression
+          "f" #'sly-eval-defun
+          "F" #'sly-undefine-function
+          "r" #'sly-eval-region)
         (:prefix "m"
-          :n "e" #'+common-lisp/macrostep/body
-          :n "E" #'macrostep-expand)
+          "e" #'+common-lisp/macrostep/body
+          "E" #'macrostep-expand)
         (:prefix "r"
-          :n "c" #'sly-mrepl-clear-repl
-          :n "q" #'sly-quit-lisp
-          :n "r" #'sly-restart-inferior-lisp
-          :n "s" #'sly-mrepl-sync)
+          "c" #'sly-mrepl-clear-repl
+          "q" #'sly-quit-lisp
+          "r" #'sly-restart-inferior-lisp
+          "s" #'sly-mrepl-sync)
         (:prefix "s"
-          :n "b" #'sly-stickers-toggle-break-on-stickers
-          :n "c" #'sly-stickers-clear-defun-stickers
-          :n "C" #'sly-stickers-clear-buffer-stickers
-          :n "f" #'sly-stickers-fetch
-          :n "r" #'sly-stickers-replay
-          :n "s" #'sly-stickers-dwim)
+          "b" #'sly-stickers-toggle-break-on-stickers
+          "c" #'sly-stickers-clear-defun-stickers
+          "C" #'sly-stickers-clear-buffer-stickers
+          "f" #'sly-stickers-fetch
+          "r" #'sly-stickers-replay
+          "s" #'sly-stickers-dwim)
         (:prefix "t"
-          :n "t" #'sly-toggle-trace-fdefinition
-          :n "T" #'sly-toggle-fancy-trace
-          :n "u" #'sly-untrace-all))
+          "t" #'sly-toggle-trace-fdefinition
+          "T" #'sly-toggle-fancy-trace
+          "u" #'sly-untrace-all))
 
   (when (featurep! :feature evil +everywhere)
     (add-hook 'sly-mode-hook #'evil-normalize-keymaps)
diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el
index b12521463..0e38143b1 100644
--- a/modules/lang/csharp/config.el
+++ b/modules/lang/csharp/config.el
@@ -25,30 +25,29 @@
     :references #'omnisharp-find-usages
     :documentation #'omnisharp-current-type-documentation)
 
-  (map! :map omnisharp-mode-map
-        :localleader
-        :n "b" #'omnisharp-recompile
+  (map! :localleader
+        :map omnisharp-mode-map
+        "b" #'omnisharp-recompile
 
         (:prefix "r"
-          :n "i"  #'omnisharp-fix-code-issue-at-point
-          :n "u"  #'omnisharp-fix-usings
-          :n "r"  #'omnisharp-rename
-          :n "a"  #'omnisharp-show-last-auto-complete-result
-          :n "o"  #'omnisharp-show-overloads-at-point)
+          "i"  #'omnisharp-fix-code-issue-at-point
+          "u"  #'omnisharp-fix-usings
+          "r"  #'omnisharp-rename
+          "a"  #'omnisharp-show-last-auto-complete-result
+          "o"  #'omnisharp-show-overloads-at-point)
 
         (:prefix "f"
-          :n "u"  #'omnisharp-find-usages
-          :n "i"  #'omnisharp-find-implementations
-          :n "f"  #'omnisharp-navigate-to-current-file-member
-          :n "m"  #'omnisharp-navigate-to-solution-member
-          :n "M"  #'omnisharp-navigate-to-solution-file-then-file-member
-          :n "F"  #'omnisharp-navigate-to-solution-file
-          :n "r"  #'omnisharp-navigate-to-region
-          :n "ti" #'omnisharp-current-type-information
-          :n "td" #'omnisharp-current-type-documentation)
+          "u"  #'omnisharp-find-usages
+          "i"  #'omnisharp-find-implementations
+          "f"  #'omnisharp-navigate-to-current-file-member
+          "m"  #'omnisharp-navigate-to-solution-member
+          "M"  #'omnisharp-navigate-to-solution-file-then-file-member
+          "F"  #'omnisharp-navigate-to-solution-file
+          "r"  #'omnisharp-navigate-to-region
+          "ti" #'omnisharp-current-type-information
+          "td" #'omnisharp-current-type-documentation)
 
         (:prefix "t"
-          :n "r" (λ! (omnisharp-unit-test "fixture"))
-          :n "s" (λ! (omnisharp-unit-test "single"))
-          :n "a" (λ! (omnisharp-unit-test "all")))))
-
+          "r" (λ! (omnisharp-unit-test "fixture"))
+          "s" (λ! (omnisharp-unit-test "single"))
+          "a" (λ! (omnisharp-unit-test "all")))))
diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index 1a7378093..9c7f6c204 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -14,14 +14,14 @@
 
 ;; `csv-mode'
 (map! :after csv-mode
-      :map csv-mode-map
       :localleader
-      :nvm "a" #'csv-align-fields
-      :nvm "u" #'csv-unalign-fields
-      :nvm "s" #'csv-sort-fields
-      :nvm "S" #'csv-sort-numeric-fields
-      :nvm "k" #'csv-kill-fields
-      :nvm "t" #'csv-transpose)
+      :map csv-mode-map
+      "a" #'csv-align-fields
+      "u" #'csv-unalign-fields
+      "s" #'csv-sort-fields
+      "S" #'csv-sort-numeric-fields
+      "k" #'csv-kill-fields
+      "t" #'csv-transpose)
 
 (def-package! graphql-mode
   :mode "\\.gql\\'")
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 5c02080df..3539f6279 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -81,21 +81,21 @@
 (when (featurep! :feature evil)
   (after! macrostep
     (evil-define-key* 'normal macrostep-keymap
-      (kbd "RET") #'macrostep-expand
-      "e"         #'macrostep-expand
-      "u"         #'macrostep-collapse
-      "c"         #'macrostep-collapse
+      [return]  #'macrostep-expand
+      "e"       #'macrostep-expand
+      "u"       #'macrostep-collapse
+      "c"       #'macrostep-collapse
 
-      [tab]       #'macrostep-next-macro
-      "\C-n"      #'macrostep-next-macro
-      "J"         #'macrostep-next-macro
+      [tab]     #'macrostep-next-macro
+      "\C-n"    #'macrostep-next-macro
+      "J"       #'macrostep-next-macro
 
-      [backtab]   #'macrostep-prev-macro
-      "K"         #'macrostep-prev-macro
-      "\C-p"      #'macrostep-prev-macro
+      [backtab] #'macrostep-prev-macro
+      "K"       #'macrostep-prev-macro
+      "\C-p"    #'macrostep-prev-macro
 
-      "q"         #'macrostep-collapse-all
-      "C"         #'macrostep-collapse-all)
+      "q"       #'macrostep-collapse-all
+      "C"       #'macrostep-collapse-all)
 
     ;; `evil-normalize-keymaps' seems to be required for macrostep or it won't
     ;; apply for the very first invocation
diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el
index 901b65b16..201bda523 100644
--- a/modules/lang/ess/config.el
+++ b/modules/lang/ess/config.el
@@ -17,41 +17,42 @@
   (set-repl-handler! 'ess-mode #'+ess/r-repl)
   (set-lookup-handlers! 'ess-mode :documentation #'ess-display-help-on-object)
 
-  (after! ess-help
-    (define-key! ess-doc-map
-      "h" #'ess-display-help-on-object
-      "p" #'ess-R-dv-pprint
-      "t" #'ess-R-dv-ctable)
-    (define-key! ess-doc-map
-      [s-return] #'ess-eval-line
-      [up]       #'comint-next-input
-      [down]     #'comint-previous-input))
-  (map! :map ess-mode-map
+  (map! (:after ess-help
+          :map ess-doc-map
+          "h" #'ess-display-help-on-object
+          "p" #'ess-R-dv-pprint
+          "t" #'ess-R-dv-ctable
+          [C-return] #'ess-eval-line
+          [up]       #'comint-next-input
+          [down]     #'comint-previous-input)
+
         :localleader
-        :nv ","        #'ess-eval-region-or-function-or-paragraph-and-step
-        :n "'"         #'R
-        :n "<tab>"     #'ess-switch-to-inferior-or-script-buffer
-        :n "<backtab>" #'ess-switch-process
-        :n ;; REPL
-        :n "B"         #'ess-eval-buffer-and-go
-        :n "b"         #'ess-eval-buffer
-        :nv "d"        #'ess-eval-region-or-line-and-step
-        :n "D"         #'ess-eval-function-or-paragraph-and-step
-        :n "L"         #'ess-eval-line-and-go
-        :n "l"         #'ess-eval-line
-        :nv "R"        #'ess-eval-region-and-go
-        :nv "r"        #'ess-eval-region
-        :n "F"         #'ess-eval-function-and-go
-        :n "f"         #'ess-eval-function
+        :map ess-mode-map
+        "," #'ess-eval-region-or-function-or-paragraph-and-step
+        "'" #'R
+        [tab]     #'ess-switch-to-inferior-or-script-buffer
+        [backtab] #'ess-switch-process
+        ;; REPL
+        "B" #'ess-eval-buffer-and-go
+        "b" #'ess-eval-buffer
+        "d" #'ess-eval-region-or-line-and-step
+        "D" #'ess-eval-function-or-paragraph-and-step
+        "L" #'ess-eval-line-and-go
+        "l" #'ess-eval-line
+        "R" #'ess-eval-region-and-go
+        "r" #'ess-eval-region
+        "F" #'ess-eval-function-and-go
+        "f" #'ess-eval-function
         ;; predefined keymaps
-        :n "h"         #'ess-doc-map
-        :n "x"         #'ess-extra-map
-        :n "p"         #'ess-r-package-dev-map
-        :n "v"         #'ess-dev-map
+        "h" #'ess-doc-map
+        "x" #'ess-extra-map
+        "p" #'ess-r-package-dev-map
+        "v" #'ess-dev-map
         ;; noweb
-        :n "cC"        #'ess-eval-chunk-and-go
-        :n "cc"        #'ess-eval-chunk
-        :n "cd"        #'ess-eval-chunk-and-step
-        :n "cm"        #'ess-noweb-mark-chunk
-        :n "cp"        #'ess-noweb-previous-chunk
-        :n "cn"        #'ess-noweb-next-chunk))
+        :prefix "c"
+        "C" #'ess-eval-chunk-and-go
+        "c" #'ess-eval-chunk
+        "d" #'ess-eval-chunk-and-step
+        "m" #'ess-noweb-mark-chunk
+        "p" #'ess-noweb-previous-chunk
+        "n" #'ess-noweb-next-chunk))
diff --git a/modules/lang/go/autoload.el b/modules/lang/go/autoload.el
index 83bfb3d96..8ef830833 100644
--- a/modules/lang/go/autoload.el
+++ b/modules/lang/go/autoload.el
@@ -37,3 +37,10 @@
         (+go--run-tests (concat "-run" "='" (match-string-no-properties 2) "'")))
     (error "Must be in a _test.go file")))
 
+;;;###autoload
+(defun +go/play-buffer-or-region (&optional beg end)
+  "TODO"
+  (interactive "r")
+  (if (use-region-p)
+      (go-play-region beg end)
+    (go-play-buffer)))
diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el
index 3ca9ab344..c350d3fe1 100644
--- a/modules/lang/go/config.el
+++ b/modules/lang/go/config.el
@@ -24,33 +24,32 @@
 
   (map! :map go-mode-map
         :localleader
-        :n "e" #'go-play-buffer
-        :v "e" #'go-play-region
-        :n "i" #'go-goto-imports      ; Go to imports
+        "e" #'+go/play-buffer-or-region
+        "i" #'go-goto-imports      ; Go to imports
         (:prefix "h"
-          :n "." #'godoc-at-point     ; Lookup in godoc
-          :n "d" #'go-guru-describe   ; Describe this
-          :n "v" #'go-guru-freevars   ; List free variables
-          :n "i" #'go-guru-implements ; Implements relations for package types
-          :n "p" #'go-guru-peers      ; List peers for channel
-          :n "P" #'go-guru-pointsto   ; What does this point to
-          :n "r" #'go-guru-referrers  ; List references to object
-          :n "e" #'go-guru-whicherrs  ; Which errors
-          :n "w" #'go-guru-what       ; What query
-          :n "c" #'go-guru-callers    ; Show callers of this function
-          :n "C" #'go-guru-callees)   ; Show callees of this function
-        (:prefix "r"
-          :n "ia" #'go-import-add
-          :n "ir" #'go-remove-unused-imports)
+          "." #'godoc-at-point     ; Lookup in godoc
+          "d" #'go-guru-describe   ; Describe this
+          "v" #'go-guru-freevars   ; List free variables
+          "i" #'go-guru-implements ; Implements relations for package types
+          "p" #'go-guru-peers      ; List peers for channel
+          "P" #'go-guru-pointsto   ; What does this point to
+          "r" #'go-guru-referrers  ; List references to object
+          "e" #'go-guru-whicherrs  ; Which errors
+          "w" #'go-guru-what       ; What query
+          "c" #'go-guru-callers    ; Show callers of this function
+          "C" #'go-guru-callees)   ; Show callees of this function
+        (:prefix "ri"
+          "a" #'go-import-add
+          "r" #'go-remove-unused-imports)
         (:prefix "b"
-          :n "r" (λ! (compile "go run ."))
-          :n "b" (λ! (compile "go build"))
-          :n "c" (λ! (compile "go clean")))
+          :desc "go run ." "r" (λ! (compile "go run ."))
+          :desc "go build" "b" (λ! (compile "go build"))
+          :desc "go clean" "c" (λ! (compile "go clean")))
         (:prefix "t"
-          :n "t" #'+go/test-rerun
-          :n "a" #'+go/test-all
-          :n "s" #'+go/test-single
-          :n "n" #'+go/test-nested)))
+          "t" #'+go/test-rerun
+          "a" #'+go/test-all
+          "s" #'+go/test-single
+          "n" #'+go/test-nested)))
 
 
 (def-package! gorepl-mode
diff --git a/modules/lang/haskell/+dante.el b/modules/lang/haskell/+dante.el
index 5362bbd31..b4af5d773 100644
--- a/modules/lang/haskell/+dante.el
+++ b/modules/lang/haskell/+dante.el
@@ -21,8 +21,8 @@
     (add-hook 'dante-mode-hook #'evil-normalize-keymaps))
   (map! :map dante-mode-map
         :localleader
-        :n "t" #'dante-type-at
-        :n "i" #'dante-info
-        :n "l" #'haskell-process-load-or-reload
-        :n "e" #'dante-eval-block
-        :n "a" #'attrap-attrap))
+        "t" #'dante-type-at
+        "i" #'dante-info
+        "l" #'haskell-process-load-or-reload
+        "e" #'dante-eval-block
+        "a" #'attrap-attrap))
diff --git a/modules/lang/haskell/+intero.el b/modules/lang/haskell/+intero.el
index 7ecf65e57..9f6c3b4cf 100644
--- a/modules/lang/haskell/+intero.el
+++ b/modules/lang/haskell/+intero.el
@@ -21,10 +21,10 @@ This is necessary because `intero-mode' doesn't do its own error checks."
 
   (when (featurep 'evil)
     (add-hook 'intero-mode-hook #'evil-normalize-keymaps))
-  (map! :map intero-mode-map
-        :localleader
-        :n "t" #'intero-type-at
-        :n "i" #'intero-info
-        :n "l" #'intero-repl-load
-        :nv "e" #'intero-repl-eval-region
-        :n "a" #'intero-apply-suggestions))
+  (map! :localleader
+        :map intero-mode-map
+        "t" #'intero-type-at
+        "i" #'intero-info
+        "l" #'intero-repl-load
+        "e" #'intero-repl-eval-region
+        "a" #'intero-apply-suggestions))
diff --git a/modules/lang/haskell/config.el b/modules/lang/haskell/config.el
index 2a608cda9..ec1c8cbee 100644
--- a/modules/lang/haskell/config.el
+++ b/modules/lang/haskell/config.el
@@ -21,11 +21,10 @@
 
   (add-to-list 'completion-ignored-extensions ".hi")
 
-  (map! :map haskell-mode-map
-        :localleader
+  (map! :localleader
+        :map haskell-mode-map
         ;; this is set to use cabal for dante users and stack for intero users:
-        :n "b" #'haskell-process-cabal-build
-        :n "c" #'haskell-cabal-visit-file
-        :v "h" #'haskell-hide-toggle
-        :nv "H" #'haskell-hide-toggle-all))
-
+        "b" #'haskell-process-cabal-build
+        "c" #'haskell-cabal-visit-file
+        "h" #'haskell-hide-toggle
+        "H" #'haskell-hide-toggle-all))
diff --git a/modules/lang/idris/config.el b/modules/lang/idris/config.el
index 2f5b5b8cb..cd56fb071 100644
--- a/modules/lang/idris/config.el
+++ b/modules/lang/idris/config.el
@@ -6,14 +6,14 @@
   (set-lookup-handlers! 'idris-mode
     :documentation #'idris-docs-at-point
     :file #'idris-load-file)
-  (map! :map idris-mode-map
-        :localleader
-        :n "r" #'idris-load-file
-        :n "t" #'idris-type-at-point
-        :n "d" #'idris-add-clause
-        :n "l" #'idris-make-lemma
-        :n "c" #'idris-case-split
-        :n "w" #'idris-make-with-block
-        :n "m" #'idris-add-missing
-        :n "p" #'idris-proof-search
-        :n "h" #'idris-docs-at-point))
+  (map! :localleader
+        :map idris-mode-map
+        "r" #'idris-load-file
+        "t" #'idris-type-at-point
+        "d" #'idris-add-clause
+        "l" #'idris-make-lemma
+        "c" #'idris-case-split
+        "w" #'idris-make-with-block
+        "m" #'idris-add-missing
+        "p" #'idris-proof-search
+        "h" #'idris-docs-at-point))
diff --git a/modules/lang/java/+eclim.el b/modules/lang/java/+eclim.el
index b96060cc2..df30de7bb 100644
--- a/modules/lang/java/+eclim.el
+++ b/modules/lang/java/+eclim.el
@@ -16,31 +16,31 @@
         help-at-pt-timer-delay 0.1)
   (help-at-pt-set-timer)
 
-  (map! :map java-mode-map
-        :localleader
+  (map! :localleader
+        :map java-mode-map
         (:prefix "r"
-          :n "gc" #'eclim-java-constructor
-          :n "gg" #'eclim-java-generate-getter-and-setter
-          :n "oi" #'eclim-java-import-organize
-          :n "f"  #'eclim-java-format
-          :n "r"  #'eclim-java-refactor-rename-symbol-at-point)
+          "gc" #'eclim-java-constructor
+          "gg" #'eclim-java-generate-getter-and-setter
+          "oi" #'eclim-java-import-organize
+          "f"  #'eclim-java-format
+          "r"  #'eclim-java-refactor-rename-symbol-at-point)
         (:prefix "h"
-          :n "."  #'eclim-java-show-documentation-for-current-element
-          :n "r"  #'eclim-java-find-references
-          :n "c"  #'eclim-java-call-hierarchy
-          :n "h"  #'eclim-java-hierarchy
-          :n "p"  #'eclim-problems
-          :n "r"  #'meghanada-reference
-          :n "t"  #'meghanada-typeinfo)
+          "."  #'eclim-java-show-documentation-for-current-element
+          "r"  #'eclim-java-find-references
+          "c"  #'eclim-java-call-hierarchy
+          "h"  #'eclim-java-hierarchy
+          "p"  #'eclim-problems
+          "r"  #'meghanada-reference
+          "t"  #'meghanada-typeinfo)
         (:prefix "b"
-          :n "b"  #'eclim-project-build
-          :n "c"  #'eclim-project-create
-          :n "d"  #'eclim-project-delete
-          :n "g"  #'eclim-project-goto
-          :n "i"  #'eclim-project-import
-          :n "k"  #'eclim-project-close
-          :n "o"  #'eclim-project-open
-          :n "u"  #'eclim-project-update)))
+          "b"  #'eclim-project-build
+          "c"  #'eclim-project-create
+          "d"  #'eclim-project-delete
+          "g"  #'eclim-project-goto
+          "i"  #'eclim-project-import
+          "k"  #'eclim-project-close
+          "o"  #'eclim-project-open
+          "u"  #'eclim-project-update)))
 
 
 (def-package! company-emacs-eclim
diff --git a/modules/lang/java/+meghanada.el b/modules/lang/java/+meghanada.el
index 9e533c141..0a0aa74f7 100644
--- a/modules/lang/java/+meghanada.el
+++ b/modules/lang/java/+meghanada.el
@@ -14,16 +14,16 @@
     :definition #'meghanada-jump-declaration
     :references #'meghanada-reference)
 
-  (map! :map java-mode-map
-        :localleader
+  (map! :localleader
+        :map java-mode-map
         (:prefix "r"
-          :n "ia" #'meghanada-import-all
-          :n "io" #'meghanada-optimize-import
-          :n "l"  #'meghanada-local-variable
-          :n "f"  #'meghanada-code-beautify)
+          "ia" #'meghanada-import-all
+          "io" #'meghanada-optimize-import
+          "l"  #'meghanada-local-variable
+          "f"  #'meghanada-code-beautify)
         (:prefix "h"
-          :n "r"  #'meghanada-reference
-          :n "t"  #'meghanada-typeinfo)
+          "r"  #'meghanada-reference
+          "t"  #'meghanada-typeinfo)
         (:prefix "b"
-          :n "f"  #'meghanada-compile-file
-          :n "p"  #'meghanada-compile-project)))
+          "f"  #'meghanada-compile-file
+          "p"  #'meghanada-compile-project)))
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 367c07407..c01b837af 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -54,7 +54,7 @@
 
   (map! :map js2-mode-map
         :localleader
-        :n "S" #'+javascript/skewer-this-buffer))
+        "S" #'+javascript/skewer-this-buffer))
 
 
 (def-package! rjsx-mode
@@ -156,12 +156,12 @@
   (add-hook! 'tide-mode-hook
     (add-hook 'kill-buffer-hook #'+javascript|cleanup-tide-processes nil t))
 
-  (map! :map tide-mode-map
-        :localleader
-        :n "R"   #'tide-restart-server
-        :n "f"   #'tide-reformat
-        :n "rs"  #'tide-rename-symbol
-        :n "roi" #'tide-organize-imports))
+  (map! :localleader
+        :map tide-mode-map
+        "R"   #'tide-restart-server
+        "f"   #'tide-reformat
+        "rs"  #'tide-rename-symbol
+        "roi" #'tide-organize-imports))
 
 
 (def-package! xref-js2
@@ -189,39 +189,39 @@
 
 
 ;; `skewer-mode'
-(map! (:after skewer-mode
+(map! :localleader
+      :prefix "s"
+      (:after skewer-mode
         :map skewer-mode-map
-        :localleader
-        :n "sE" #'skewer-eval-last-expression
-        :n "se" #'skewer-eval-defun
-        :n "sf" #'skewer-load-buffer)
+        "E" #'skewer-eval-last-expression
+        "e" #'skewer-eval-defun
+        "f" #'skewer-load-buffer)
 
       (:after skewer-css
         :map skewer-css-mode-map
-        :localleader
-        :n "se" #'skewer-css-eval-current-declaration
-        :n "sr" #'skewer-css-eval-current-rule
-        :n "sb" #'skewer-css-eval-buffer
-        :n "sc" #'skewer-css-clear-all)
+        "e" #'skewer-css-eval-current-declaration
+        "r" #'skewer-css-eval-current-rule
+        "b" #'skewer-css-eval-buffer
+        "c" #'skewer-css-clear-all)
 
       (:after skewer-html
         :map skewer-html-mode-map
-        :localleader
-        :n "se" #'skewer-html-eval-tag))
+        "e" #'skewer-html-eval-tag))
 
 
 ;; `npm-mode'
 (map! :after npm-mode
-      :map npm-mode-keymap
       :localleader
-      :n "nn" #'npm-mode-npm-init
-      :n "ni" #'npm-mode-npm-install
-      :n "ns" #'npm-mode-npm-install-save
-      :n "nd" #'npm-mode-npm-install-save-dev
-      :n "nu" #'npm-mode-npm-uninstall
-      :n "nl" #'npm-mode-npm-list
-      :n "nr" #'npm-mode-npm-run
-      :n "nv" #'npm-mode-visit-project-file)
+      :map npm-mode-keymap
+      :prefix "n"
+      "n" #'npm-mode-npm-init
+      "i" #'npm-mode-npm-install
+      "s" #'npm-mode-npm-install-save
+      "d" #'npm-mode-npm-install-save-dev
+      "u" #'npm-mode-npm-uninstall
+      "l" #'npm-mode-npm-list
+      "r" #'npm-mode-npm-run
+      "v" #'npm-mode-visit-project-file)
 
 
 ;;
diff --git a/modules/lang/latex/+ref.el b/modules/lang/latex/+ref.el
index 75136a077..c4b19f251 100644
--- a/modules/lang/latex/+ref.el
+++ b/modules/lang/latex/+ref.el
@@ -21,7 +21,7 @@
   (when +latex-bibtex-file
     (setq reftex-default-bibliography (list (expand-file-name +latex-bibtex-file))))
   (map! :map reftex-mode-map
-        :localleader :n ";" 'reftex-toc)
+        :localleader ";" 'reftex-toc)
   (add-hook! 'reftex-toc-mode-hook
     (reftex-toc-rescan)
     (map! :map 'local
diff --git a/modules/lang/ledger/config.el b/modules/lang/ledger/config.el
index 700d127da..a5ec20d0f 100644
--- a/modules/lang/ledger/config.el
+++ b/modules/lang/ledger/config.el
@@ -11,13 +11,13 @@
 (advice-add #'ledger-check-version :around #'+ledger*check-version)
 
 ;; Restore leader key in ledger reports
-(after! ledger-mode
-  (define-key! ledger-report-mode-map
-    (kbd "C-c C-c") #'ledger-report-edit-report
-    (kbd "C-c C-r") #'ledger-report-redo
-    (kbd "C-c C-s") #'ledger-report-save)
-  (define-key ledger-reconcile-mode-map
-    [tab] #'ledger-reconcile-toggle))
+(map! :after ledger-mode
+      :map ledger-report-mode-map
+      "C-c C-c" #'ledger-report-edit-report
+      "C-c C-r" #'ledger-report-redo
+      "C-c C-s" #'ledger-report-save
+      :map ledger-reconcile-mode-map
+      [tab] #'ledger-reconcile-toggle)
 
 
 (def-package! flycheck-ledger
@@ -30,26 +30,27 @@
   :hook (ledger-mode . evil-ledger-mode)
   :config
   (set-evil-initial-state! 'ledger-report-mode 'normal)
-  (evil-define-key* 'normal ledger-report-mode-map
-    "q"   #'ledger-report-quit
-    "RET" #'ledger-report-edit-report
-    "gd"  #'ledger-report-visit-source
-    "gr"  #'ledger-report-redo)
-  (evil-define-key* 'motion ledger-mode-map
-    "]]" #'ledger-navigate-next-xact-or-directive
-    "[[" #'ledger-navigate-prev-xact-or-directive)
-  (map! :map ledger-mode-map
+  (map! :map ledger-report-mode-map
+        :n "q"   #'ledger-report-quit
+        :n "RET" #'ledger-report-edit-report
+        :n "gd"  #'ledger-report-visit-source
+        :n "gr"  #'ledger-report-redo
+        :map ledger-mode-map
+        :m "]]" #'ledger-navigate-next-xact-or-directive
+        :m "[[" #'ledger-navigate-prev-xact-or-directive
+
         :localleader
-        :n "a" #'ledger-add-transaction
-        :n "t" #'ledger-toggle-current
-        :n "d" #'ledger-delete-current-transaction
-        :n "r" #'ledger-report
-        :n "R" #'ledger-reconcile
-        :n "S" #'ledger-schedule-upcoming
-        :v "s" #'ledger-sort-region
+        :map ledger-mode-map
+        "a" #'ledger-add-transaction
+        "t" #'ledger-toggle-current
+        "d" #'ledger-delete-current-transaction
+        "r" #'ledger-report
+        "R" #'ledger-reconcile
+        "s" #'ledger-sort-region
+        "S" #'ledger-schedule-upcoming
         (:prefix "g"
-          :n "s" #'ledger-display-ledger-stats
-          :n "b" #'ledger-display-balance-at-point))
+          "s" #'ledger-display-ledger-stats
+          "b" #'ledger-display-balance-at-point))
   ;; Fix inaccurate keybind message
   (defun +ledger*fix-key-help (&rest _)
     (message "q to quit; gr to redo; RET to edit; C-c C-s to save"))
diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el
index a951c3067..5d0016ee9 100644
--- a/modules/lang/lua/config.el
+++ b/modules/lang/lua/config.el
@@ -22,6 +22,6 @@
   :modes (lua-mode markdown-mode json-mode)
   :files (and "main.lua" "conf.lua")
   :on-load
-  (map! :map +lua-love-mode-map
-        :localleader
-        :n "b" #'+lua/run-love-game))
+  (map! :localleader
+        :map +lua-love-mode-map
+        "b" #'+lua/run-love-game))
diff --git a/modules/lang/nim/config.el b/modules/lang/nim/config.el
index 22db62b9e..f5f960467 100644
--- a/modules/lang/nim/config.el
+++ b/modules/lang/nim/config.el
@@ -31,9 +31,9 @@ windows."
       (replace-regexp-in-string "[꞉* |<>\"?*]" "" path))
     (advice-add #'nimsuggest--get-temp-file-name :filter-return #'doom*nimsuggest--get-temp-file-name))
 
-  (map! :map nim-mode-map
-        :localleader
-        :n "b" #'nim-compile))
+  (map! :localleader
+        :map nim-mode-map
+        "b" #'nim-compile))
 
 
 (def-package! flycheck-nim
diff --git a/modules/lang/nix/config.el b/modules/lang/nix/config.el
index ca0ea6adc..805edff45 100644
--- a/modules/lang/nix/config.el
+++ b/modules/lang/nix/config.el
@@ -5,16 +5,16 @@
   :config
   (set-company-backend! 'nix-mode 'company-nixos-options)
 
-  (map! :map nix-mode-map
-        :localleader
-        :n "f" #'nix-update-fetch
-        :n "p" #'nix-format-buffer
-        :n "r" #'nix-repl-show
-        :n "s" #'nix-shell
-        :n "b" #'nix-build
-        :n "u" #'nix-unpack
+  (map! :localleader
+        :map nix-mode-map
+        "f" #'nix-update-fetch
+        "p" #'nix-format-buffer
+        "r" #'nix-repl-show
+        "s" #'nix-shell
+        "b" #'nix-build
+        "u" #'nix-unpack
         (:when (featurep! :completion helm)
-          :n "o" #'helm-nixos-options)))
+          "o" #'helm-nixos-options)))
 
 (def-package! nix-drv-mode
   :mode "\\.drv\\'")
diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el
index adc3347c7..f5a5df757 100644
--- a/modules/lang/ocaml/config.el
+++ b/modules/lang/ocaml/config.el
@@ -34,10 +34,10 @@
     :config
     (setq merlin-completion-with-doc t)
 
-    (map! :map tuareg-mode-map
-          :localleader
-          :n "t" #'merlin-type-enclosing
-          :n "a" #'tuareg-find-alternate-file))
+    (map! :localleader
+          :map tuareg-mode-map
+          "t" #'merlin-type-enclosing
+          "a" #'tuareg-find-alternate-file))
 
 
   (def-package! flycheck-ocaml
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index b42ceb1d4..0ba5e6a06 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -339,74 +339,77 @@ between the two."
   (advice-add #'evil-org-open-below :around #'+org*evil-org-open-below)
 
   ;; Undo keybinds in `evil-collection-outline'
-  (evil-define-key* 'normal outline-mode-map
-    "^" nil
-    [backtab] nil
-    "\M-j" nil "\M-k" nil
-    "\C-j" nil "\C-k" nil
-    "]" nil "[" nil)
-  (evil-define-key* 'insert evil-org-mode-map
-    ;; dedent with shift-tab in insert mode
-    [backtab] #'+org/dedent
-    ;; navigate table cells (from insert-mode)
-    "\C-l" #'+org/table-next-field
-    "\C-h" #'+org/table-previous-field
-    "\C-k" #'+org/table-previous-row
-    "\C-j" #'+org/table-next-row)
-  ;; expand tables or move fields
-  (evil-define-key* '(insert normal) evil-org-mode-map
-    (kbd "C-S-l") #'+org/table-append-field-or-shift-right
-    (kbd "C-S-h") #'+org/table-prepend-field-or-shift-left
-    (kbd "C-S-k") #'org-metaup
-    (kbd "C-S-j") #'org-metadown)
-  ;; more intuitive RET keybinds
-  (evil-define-key* 'insert evil-org-mode-map
-    [return] #'org-return-indent)
-  (evil-define-key* 'normal evil-org-mode-map
-    [return] #'+org/dwim-at-point)
-  (evil-define-key* '(insert normal) evil-org-mode-map
-    [M-return]   (λ! (+org/insert-item 'below))
-    [S-M-return] (λ! (+org/insert-item 'above)))
-  ;; more vim-esque org motion keys
-  (evil-define-key* 'motion evil-org-mode-map
-    "]]"  (λ! (org-forward-heading-same-level nil) (org-beginning-of-line))
-    "[["  (λ! (org-backward-heading-same-level nil) (org-beginning-of-line))
-    "]h"  #'org-next-visible-heading
-    "[h"  #'org-previous-visible-heading
-    "]l"  #'org-next-link
-    "[l"  #'org-previous-link
-    "]s"  #'org-babel-next-src-block
-    "[s"  #'org-babel-previous-src-block
-    "^"   #'evil-org-beginning-of-line
-    "0"   (λ! (let (visual-line-mode) (org-beginning-of-line))))
-  (evil-define-key* 'normal evil-org-mode-map
-    "gQ"  #'org-fill-paragraph
-    ;; sensible vim-esque folding keybinds
-    "za"  #'+org/toggle-fold
-    "zA"  #'org-shifttab
-    "zc"  #'+org/close-fold
-    "zC"  #'outline-hide-subtree
-    "zm"  #'+org/hide-next-fold-level
-    "zo"  #'+org/open-fold
-    "zO"  #'outline-show-subtree
-    "zr"  #'+org/show-next-fold-level
-    "zR"  #'outline-show-all)
-  ;; <localleader>
-  (map! :map evil-org-mode-map
-        :localleader
-        :n "d" #'org-deadline
-        :n "t" #'org-todo
-        (:prefix "c"
-          :n "c" #'org-clock-in
-          :n "C" #'org-clock-out
-          :n "g" #'org-clock-goto
-          :n "G" (λ! (org-clock-goto 'select))
-          :n "x" #'org-clock-cancel))
-  (map! :map org-read-date-minibuffer-local-map
-        "C-h" (λ! (org-eval-in-calendar '(calendar-backward-day 1)))
-        "C-l" (λ! (org-eval-in-calendar '(calendar-forward-day 1)))
-        "C-k" (λ! (org-eval-in-calendar '(calendar-backward-week 1)))
-        "C-j" (λ! (org-eval-in-calendar '(calendar-forward-week 1)))
+  (map! :map outline-mode-map
+        :n "^" nil
+        :n [backtab] nil
+        :n "M-j" nil
+        :n "M-k" nil
+        :n "C-j" nil
+        :n "C-k" nil
+        :n "]" nil
+        :n "[" nil
+
+        :map evil-org-mode-map
+        ;; dedent with shift-tab in insert mode
+        :i [backtab] #'+org/dedent
+        ;; navigate table cells (from insert-mode)
+        :i "C-l" #'+org/table-next-field
+        :i "C-h" #'+org/table-previous-field
+        :i "C-k" #'+org/table-previous-row
+        :i "C-j" #'+org/table-next-row
+        ;; expand tables or move fields
+        :ni "C-S-l" #'+org/table-append-field-or-shift-right
+        :ni "C-S-h" #'+org/table-prepend-field-or-shift-left
+        :ni "C-S-k" #'org-metaup
+        :ni "C-S-j" #'org-metadown
+        ;; more intuitive RET keybinds
+        :i  [return] #'org-return-indent
+        :n  [return] #'+org/dwim-at-point
+        :nv [C-return]   (λ! (+org/insert-item 'below))
+        :nv [S-C-return] (λ! (+org/insert-item 'below))
+        (:when IS-MAC
+          ;; textmate-esque newline insertion
+          :nv [s-return]    (λ! (+org/insert-item 'below))
+          :nv [S-s-return]  (λ! (+org/insert-item 'below)))
+        ;; more vim-esque org motion keys (not covered by evil-org-mode)
+        :m "]]"  (λ! (org-forward-heading-same-level nil) (org-beginning-of-line))
+        :m "[["  (λ! (org-backward-heading-same-level nil) (org-beginning-of-line))
+        :m "]h"  #'org-next-visible-heading
+        :m "[h"  #'org-previous-visible-heading
+        :m "]l"  #'org-next-link
+        :m "[l"  #'org-previous-link
+        :m "]s"  #'org-babel-next-src-block
+        :m "[s"  #'org-babel-previous-src-block
+        :m "^"   #'evil-org-beginning-of-line
+        :m "0"   (λ! (let (visual-line-mode) (org-beginning-of-line)))
+        :n "gQ"  #'org-fill-paragraph
+        ;; sensible vim-esque folding keybinds
+        :n "za"  #'+org/toggle-fold
+        :n "zA"  #'org-shifttab
+        :n "zc"  #'+org/close-fold
+        :n "zC"  #'outline-hide-subtree
+        :n "zm"  #'+org/hide-next-fold-level
+        :n "zo"  #'+org/open-fold
+        :n "zO"  #'outline-show-subtree
+        :n "zr"  #'+org/show-next-fold-level
+        :n "zR"  #'outline-show-all
+
+        ;; <localleader>
+        (:localleader
+          "d" #'org-deadline
+          "t" #'org-todo
+          (:prefix "c"
+            "c" #'org-clock-in
+            "C" #'org-clock-out
+            "g" #'org-clock-goto
+            "G" (λ! (org-clock-goto 'select))
+            "x" #'org-clock-cancel))
+
+        :map org-read-date-minibuffer-local-map
+        "C-h"   (λ! (org-eval-in-calendar '(calendar-backward-day 1)))
+        "C-l"   (λ! (org-eval-in-calendar '(calendar-forward-day 1)))
+        "C-k"   (λ! (org-eval-in-calendar '(calendar-backward-week 1)))
+        "C-j"   (λ! (org-eval-in-calendar '(calendar-forward-week 1)))
         "C-S-h" (λ! (org-eval-in-calendar '(calendar-backward-month 1)))
         "C-S-l" (λ! (org-eval-in-calendar '(calendar-forward-month 1)))
         "C-S-k" (λ! (org-eval-in-calendar '(calendar-backward-year 1)))
diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el
index 90fa3be46..c14f73f6d 100644
--- a/modules/lang/php/config.el
+++ b/modules/lang/php/config.el
@@ -23,12 +23,12 @@
     (sp-local-pair "<?"    "?>" :post-handlers '(("| " "SPC" "=") ("||\n[i]" "RET") ("[d2]" "p")))
     (sp-local-pair "<?php" "?>" :post-handlers '(("| " "SPC") ("||\n[i]" "RET"))))
 
-  (map! :map php-mode-map
-        :localleader
+  (map! :localleader
+        :map php-mode-map
         :prefix "t"
-        :n "r"  #'phpunit-current-project
-        :n "a"  #'phpunit-current-class
-        :n "s"  #'phpunit-current-test))
+        "r" #'phpunit-current-project
+        "a" #'phpunit-current-class
+        "s" #'phpunit-current-test))
 
 
 (def-package! phpactor
@@ -53,26 +53,26 @@
               default-directory)))
   (advice-add #'phpactor-get-working-dir :before #'+php*project-root)
 
-  (map! :map php-mode-map
-        :localleader
+  (map! :localleader
+        :map php-mode-map
         :prefix "r"
-        :n "cc" #'phpactor-copy-class
-        :n "mc" #'phpactor-move-class
-        :v "oi" #'phpactor-offset-info
-        :n "t"  #'phpactor-transform
-        :n "ic" #'phpactor-import-class))
+        "cc" #'phpactor-copy-class
+        "mc" #'phpactor-move-class
+        "oi" #'phpactor-offset-info
+        "t"  #'phpactor-transform
+        "ic" #'phpactor-import-class))
 
 
 (def-package! php-refactor-mode
   :hook php-mode
   :config
-  (map! :map php-refactor-mode-map
-        :localleader
+  (map! :localleader
+        :map php-refactor-mode-map
         :prefix "r"
-        :n "cv" #'php-refactor--convert-local-to-instance-variable
-        :n "u"  #'php-refactor--optimize-use
-        :v "xm" #'php-refactor--extract-method
-        :n "rv" #'php-refactor--rename-local-variable))
+        "cv" #'php-refactor--convert-local-to-instance-variable
+        "u"  #'php-refactor--optimize-use
+        "xm" #'php-refactor--extract-method
+        "rv" #'php-refactor--rename-local-variable))
 
 
 (def-package! php-extras
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 5d31fa9a2..681486b91 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -87,14 +87,14 @@ called.")
 
   (when (featurep 'evil)
     (add-hook 'anaconda-mode-hook #'evil-normalize-keymaps))
-  (map! :map anaconda-mode-map
-        :localleader
+  (map! :localleader
+        :map anaconda-mode-map
         :prefix "f"
-        :nv "d" #'anaconda-mode-find-definitions
-        :nv "h" #'anaconda-mode-show-doc
-        :nv "a" #'anaconda-mode-find-assignments
-        :nv "f" #'anaconda-mode-find-file
-        :nv "u" #'anaconda-mode-find-references))
+        "d" #'anaconda-mode-find-definitions
+        "h" #'anaconda-mode-show-doc
+        "a" #'anaconda-mode-find-assignments
+        "f" #'anaconda-mode-find-file
+        "u" #'anaconda-mode-find-references))
 
 
 (def-package! nose
@@ -107,29 +107,29 @@ called.")
   (when (featurep 'evil)
     (add-hook 'nose-mode-hook #'evil-normalize-keymaps))
 
-  (map! :map nose-mode-map
-        :localleader
+  (map! :localleader
+        :map nose-mode-map
         :prefix "t"
-        :n "r" #'nosetests-again
-        :n "a" #'nosetests-all
-        :n "s" #'nosetests-one
-        :n "v" #'nosetests-module
-        :n "A" #'nosetests-pdb-all
-        :n "O" #'nosetests-pdb-one
-        :n "V" #'nosetests-pdb-module))
+        "r" #'nosetests-again
+        "a" #'nosetests-all
+        "s" #'nosetests-one
+        "v" #'nosetests-module
+        "A" #'nosetests-pdb-all
+        "O" #'nosetests-pdb-one
+        "V" #'nosetests-pdb-module))
 
 
 (def-package! python-pytest
   :defer t
   :init
   (map! :after python
-        :map python-mode-map
         :localleader
+        :map python-mode-map
         :prefix "t"
-        :nv "f" #'python-pytest-file
-        :nv "k" #'python-pytest-file-dwim
-        :nv "m" #'python-pytest-repeat
-        :nv "p" #'python-pytest-popup))
+        "f" #'python-pytest-file
+        "k" #'python-pytest-file-dwim
+        "m" #'python-pytest-repeat
+        "p" #'python-pytest-popup))
 
 
 ;;
diff --git a/modules/lang/racket/config.el b/modules/lang/racket/config.el
index 6f86bc3f9..7359baebb 100644
--- a/modules/lang/racket/config.el
+++ b/modules/lang/racket/config.el
@@ -20,33 +20,33 @@
 
   (add-hook! racket-mode #'(rainbow-delimiters-mode highlight-quoted-mode))
 
-  (map! :map racket-mode-map
-        :localleader
-        :n "a"   #'racket-align
-        :n "A"   #'racket-unalign
-        :n "f"   #'racket-fold-all-tests
-        :n "F"   #'racket-unfold-all-tests
-        :n "h"   #'racket-doc
-        :n "i"   #'racket-unicode-input-method-enable
-        :n "l"   #'racket-logger
-        :n "o"   #'racket-profile
-        :n "p"   #'racket-cycle-paren-shapes
-        :n "r"   #'racket-run
-        :n "R"   #'racket-run-and-switch-to-repl
-        :n "t"   #'racket-test
-        :n "u"   #'racket-backward-up-list
-        :n "y"   #'racket-insert-lambda
+  (map! :localleader
+        :map racket-mode-map
+        "a" #'racket-align
+        "A" #'racket-unalign
+        "f" #'racket-fold-all-tests
+        "F" #'racket-unfold-all-tests
+        "h" #'racket-doc
+        "i" #'racket-unicode-input-method-enable
+        "l" #'racket-logger
+        "o" #'racket-profile
+        "p" #'racket-cycle-paren-shapes
+        "r" #'racket-run
+        "R" #'racket-run-and-switch-to-repl
+        "t" #'racket-test
+        "u" #'racket-backward-up-list
+        "y" #'racket-insert-lambda
         (:prefix "e"
-          :n "d" #'racket-expand-definition
-          :n "l" #'racket-expand-last-sexp
-          :n "r" #'racket-expand-region
-          :n "a" #'racket-expand-again)
+          "d" #'racket-expand-definition
+          "l" #'racket-expand-last-sexp
+          "r" #'racket-expand-region
+          "a" #'racket-expand-again)
         (:prefix "g"
-          :n "d" #'racket-visit-definition
-          :n "m" #'racket-visit-module
-          :n "r" #'racket-open-require-path
-          :n "b" #'racket-unvisit)
+          "d" #'racket-visit-definition
+          "m" #'racket-visit-module
+          "r" #'racket-open-require-path
+          "b" #'racket-unvisit)
         (:prefix "s"
-          :n "d" #'racket-send-definition
-          :n "l" #'racket-send-last-sexp
-          :n "r" #'racket-send-region)))
+          "d" #'racket-send-definition
+          "l" #'racket-send-last-sexp
+          "r" #'racket-send-region)))
diff --git a/modules/lang/rest/config.el b/modules/lang/rest/config.el
index 014840039..a9b3d67e2 100644
--- a/modules/lang/rest/config.el
+++ b/modules/lang/rest/config.el
@@ -22,9 +22,9 @@
         :n "zr" #'outline-show-all
 
         :localleader
-        :n "e" #'restclient-http-send-current
-        :n "E" #'restclient-http-send-current-raw
-        :n "c" #'restclient-copy-curl-command))
+        "e" #'restclient-http-send-current
+        "E" #'restclient-http-send-current-raw
+        "c" #'restclient-copy-curl-command))
 
 
 (def-package! company-restclient
diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 9db3e7fd6..16eb2cbff 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -51,17 +51,17 @@
     :documentation #'robe-doc)
   (map! :localleader
         :map robe-mode-map
-        :n "'"  #'robe-start
+        "'"  #'robe-start
         ;; robe mode specific
-        :n "h"  #'robe-doc
-        :n "rr" #'robe-rails-refresh
+        "h"  #'robe-doc
+        "rr" #'robe-rails-refresh
         ;; inf-enh-ruby-mode
         :prefix "s"
-        :n "f" #'ruby-send-definition
-        :n "F" #'ruby-send-definition-and-go
-        :n "r" #'ruby-send-region
-        :n "R" #'ruby-send-region-and-go
-        :n "i" #'ruby-switch-to-inf))
+        "f"  #'ruby-send-definition
+        "F"  #'ruby-send-definition-and-go
+        "r"  #'ruby-send-region
+        "R"  #'ruby-send-region-and-go
+        "i"  #'ruby-switch-to-inf))
 
 
 ;; NOTE Must be loaded before `robe-mode'
@@ -72,12 +72,12 @@
 (def-package! rubocop
   :hook (enh-ruby-mode . rubocop-mode)
   :config
-  (map! :map rubocop-mode-map
-        :localleader
-        :nv "f" #'rubocop-check-current-file
-        :nv "F" #'rubocop-autocorrect-current-file
-        :nv "p" #'rubocop-check-project
-        :nv "P" #'rubocop-autocorrect-project))
+  (map! :localleader
+        :map rubocop-mode-map
+        "f" #'rubocop-check-current-file
+        "F" #'rubocop-autocorrect-current-file
+        "p" #'rubocop-check-project
+        "P" #'rubocop-autocorrect-project))
 
 
 ;;
@@ -91,10 +91,10 @@
         :localleader
         :map enh-ruby-mode-map
         :prefix "k"
-        :n "k" #'rake
-        :n "r" #'rake-rerun
-        :n "R" #'rake-regenerate-cache
-        :n "f" #'rake-find-task))
+        "k" #'rake
+        "r" #'rake-rerun
+        "R" #'rake-regenerate-cache
+        "f" #'rake-find-task))
 
 (def-package! bundler
   :defer t
@@ -103,12 +103,12 @@
         :localleader
         :map enh-ruby-mode-map
         :prefix "b"
-        :n "c" #'bundle-check
-        :n "C" #'bundle-console
-        :n "i" #'bundle-install
-        :n "u" #'bundle-update
-        :n "e" #'bundle-exec
-        :n "o" #'bundle-open))
+        "c" #'bundle-check
+        "C" #'bundle-console
+        "i" #'bundle-install
+        "u" #'bundle-update
+        "e" #'bundle-exec
+        "o" #'bundle-open))
 
 ;; `rvm'
 (setq rspec-use-rvm t)
@@ -136,20 +136,20 @@
     (setq rspec-verifiable-mode-keymap (make-sparse-keymap)
           rspec-mode-keymap (make-sparse-keymap)))
   :config
-  (map! :map rspec-mode-map
-        :localleader
+  (map! :localleader
+        :map rspec-mode-map
         :prefix "t"
-        :n "r" #'rspec-rerun
-        :n "a" #'rspec-verify-all
-        :n "s" #'rspec-verify-single
-        :n "v" #'rspec-verify
-        :n "c" #'rspec-verify-continue
-        :n "e" #'rspec-toggle-example-pendingness
-        :n "f" #'rspec-verify-method
-        :n "l" #'rspec-run-last-failed
-        :n "m" #'rspec-verify-matching
-        :n "t" #'rspec-toggle-spec-and-target-find-example
-        :n "T" #'rspec-toggle-spec-and-target))
+        "r" #'rspec-rerun
+        "a" #'rspec-verify-all
+        "s" #'rspec-verify-single
+        "v" #'rspec-verify
+        "c" #'rspec-verify-continue
+        "e" #'rspec-toggle-example-pendingness
+        "f" #'rspec-verify-method
+        "l" #'rspec-run-last-failed
+        "m" #'rspec-verify-matching
+        "t" #'rspec-toggle-spec-and-target-find-example
+        "T" #'rspec-toggle-spec-and-target))
 
 
 (def-package! minitest
@@ -157,10 +157,10 @@
   :config
   (when (featurep! :feature evil)
     (add-hook 'minitest-mode-hook #'evil-normalize-keymaps))
-  (map! :map minitest-mode-map
-        :localleader
+  (map! :localleader
+        :map minitest-mode-map
         :prefix "t"
-        :n "r" #'minitest-rerun
-        :n "a" #'minitest-verify-all
-        :n "s" #'minitest-verify-single
-        :n "v" #'minitest-verify))
+        "r" #'minitest-rerun
+        "a" #'minitest-verify-all
+        "s" #'minitest-verify-single
+        "v" #'minitest-verify))
diff --git a/modules/lang/web/+html.el b/modules/lang/web/+html.el
index 610deca66..06d6cd721 100644
--- a/modules/lang/web/+html.el
+++ b/modules/lang/web/+html.el
@@ -61,67 +61,67 @@
 
   (map! :map web-mode-map
         (:localleader
-          :desc "Rehighlight buffer" :n "h" #'web-mode-buffer-highlight
-          :desc "Indent buffer"      :n "i" #'web-mode-buffer-indent
+          :desc "Rehighlight buffer" "h" #'web-mode-buffer-highlight
+          :desc "Indent buffer"      "i" #'web-mode-buffer-indent
 
           (:prefix "a"
-            :n "b" #'web-mode-attribute-beginning
-            :n "e" #'web-mode-attribute-end
-            :n "i" #'web-mode-attribute-insert
-            :n "n" #'web-mode-attribute-next
-            :n "s" #'web-mode-attribute-select
-            :n "k" #'web-mode-attribute-kill
-            :n "p" #'web-mode-attribute-previous
-            :n "p" #'web-mode-attribute-transpose)
+            "b" #'web-mode-attribute-beginning
+            "e" #'web-mode-attribute-end
+            "i" #'web-mode-attribute-insert
+            "n" #'web-mode-attribute-next
+            "s" #'web-mode-attribute-select
+            "k" #'web-mode-attribute-kill
+            "p" #'web-mode-attribute-previous
+            "p" #'web-mode-attribute-transpose)
 
           (:prefix "b"
-            :n "b" #'web-mode-block-beginning
-            :n "c" #'web-mode-block-close
-            :n "e" #'web-mode-block-end
-            :n "k" #'web-mode-block-kill
-            :n "n" #'web-mode-block-next
-            :n "p" #'web-mode-block-previous
-            :n "s" #'web-mode-block-select)
+            "b" #'web-mode-block-beginning
+            "c" #'web-mode-block-close
+            "e" #'web-mode-block-end
+            "k" #'web-mode-block-kill
+            "n" #'web-mode-block-next
+            "p" #'web-mode-block-previous
+            "s" #'web-mode-block-select)
 
           (:prefix "d"
-            :n "a" #'web-mode-dom-apostrophes-replace
-            :n "d" #'web-mode-dom-errors-show
-            :n "e" #'web-mode-dom-entities-encode
-            :n "n" #'web-mode-dom-normalize
-            :n "q" #'web-mode-dom-quotes-replace
-            :n "t" #'web-mode-dom-traverse
-            :n "x" #'web-mode-dom-xpath)
+            "a" #'web-mode-dom-apostrophes-replace
+            "d" #'web-mode-dom-errors-show
+            "e" #'web-mode-dom-entities-encode
+            "n" #'web-mode-dom-normalize
+            "q" #'web-mode-dom-quotes-replace
+            "t" #'web-mode-dom-traverse
+            "x" #'web-mode-dom-xpath)
 
           (:prefix "e"
-            :n "/" #'web-mode-element-close
-            :n "a" #'web-mode-element-content-select
-            :n "b" #'web-mode-element-beginning
-            :n "c" #'web-mode-element-clone
-            :n "d" #'web-mode-element-child
-            :n "e" #'web-mode-element-end
-            :n "f" #'web-mode-element-children-fold-or-unfold
-            :n "i" #'web-mode-element-insert
-            :n "k" #'web-mode-element-kill
-            :n "m" #'web-mode-element-mute-blanks
-            :n "n" #'web-mode-element-next
-            :n "p" #'web-mode-element-previous
-            :n "r" #'web-mode-element-rename
-            :n "s" #'web-mode-element-select
-            :n "t" #'web-mode-element-transpose
-            :n "u" #'web-mode-element-parent
-            :n "v" #'web-mode-element-vanish
-            :n "w" #'web-mode-element-wrap)
+            "/" #'web-mode-element-close
+            "a" #'web-mode-element-content-select
+            "b" #'web-mode-element-beginning
+            "c" #'web-mode-element-clone
+            "d" #'web-mode-element-child
+            "e" #'web-mode-element-end
+            "f" #'web-mode-element-children-fold-or-unfold
+            "i" #'web-mode-element-insert
+            "k" #'web-mode-element-kill
+            "m" #'web-mode-element-mute-blanks
+            "n" #'web-mode-element-next
+            "p" #'web-mode-element-previous
+            "r" #'web-mode-element-rename
+            "s" #'web-mode-element-select
+            "t" #'web-mode-element-transpose
+            "u" #'web-mode-element-parent
+            "v" #'web-mode-element-vanish
+            "w" #'web-mode-element-wrap)
 
           (:prefix "t"
-            :n "a" #'web-mode-tag-attributes-sort
-            :n "b" #'web-mode-tag-beginning
-            :n "e" #'web-mode-tag-end
-            :n "m" #'web-mode-tag-match
-            :n "n" #'web-mode-tag-next
-            :n "p" #'web-mode-tag-previous
-            :n "s" #'web-mode-tag-select))
+            "a" #'web-mode-tag-attributes-sort
+            "b" #'web-mode-tag-beginning
+            "e" #'web-mode-tag-end
+            "m" #'web-mode-tag-match
+            "n" #'web-mode-tag-next
+            "p" #'web-mode-tag-previous
+            "s" #'web-mode-tag-select))
 
-        "M-/" #'web-mode-comment-or-uncomment
+        :g  "M-/" #'web-mode-comment-or-uncomment
         :i  "SPC" #'self-insert-command
         :n  "za"  #'web-mode-fold-or-unfold
         :nv "]a"  #'web-mode-attribute-next
diff --git a/modules/tools/ansible/config.el b/modules/tools/ansible/config.el
index d44a4b8b3..cb75a6dda 100644
--- a/modules/tools/ansible/config.el
+++ b/modules/tools/ansible/config.el
@@ -9,9 +9,9 @@
         ansible::task-label-face 'font-lock-doc-face)
   (map! :map ansible::key-map
         :localleader
-        :n "d" #'ansible::decrypt-buffer
-        :n "e" #'ansible::encrypt-buffer
-        :n "h" #'ansible-doc))
+        :desc "Decrypt buffer"          "d" #'ansible::decrypt-buffer
+        :desc "Encrypt buffer"          "e" #'ansible::encrypt-buffer
+        :desc "Look up in Ansible docs" "h" #'ansible-doc))
 
 (after! ansible-doc
   (set-evil-initial-state! '(ansible-doc-module-mode) 'emacs))
diff --git a/modules/tools/terraform/config.el b/modules/tools/terraform/config.el
index e4523ca2e..89b0315fc 100644
--- a/modules/tools/terraform/config.el
+++ b/modules/tools/terraform/config.el
@@ -3,9 +3,9 @@
 (map! :after terraform-mode
       :map terraform-mode-map
       :localleader
-      :n "a" (λ! (compile "terraform apply"))
-      :n "i" (λ! (compile "terraform init"))
-      :n "p" (λ! (compile "terraform plan")))
+      :desc "terraform apply" "a" (λ! (compile "terraform apply"))
+      :desc "terraform init"  "i" (λ! (compile "terraform init"))
+      :desc "terraform plan"  "p" (λ! (compile "terraform plan")))
 
 
 (def-package! company-terraform
diff --git a/modules/ui/deft/config.el b/modules/ui/deft/config.el
index bf05359ec..d1d0d24dc 100644
--- a/modules/ui/deft/config.el
+++ b/modules/ui/deft/config.el
@@ -19,14 +19,14 @@
   (set-evil-initial-state! 'deft-mode 'insert)
   (map! :map deft-mode-map
         :localleader
-        :n "RET" #'deft-new-file-named
-        :n "a" #'deft-archive-file
-        :n "c" #'deft-filter-clear
-        :n "d" #'deft-delete-file
-        :n "f" #'deft-find-file
-        :n "g" #'deft-refresh
-        :n "l" #'deft-filter
-        :n "n" #'deft-new-file
-        :n "r" #'deft-rename-file
-        :n "s" #'deft-toggle-sort-method
-        :n "t" #'deft-toggle-incremental-search))
+        "RET" #'deft-new-file-named
+        "a"   #'deft-archive-file
+        "c"   #'deft-filter-clear
+        "d"   #'deft-delete-file
+        "f"   #'deft-find-file
+        "g"   #'deft-refresh
+        "l"   #'deft-filter
+        "n"   #'deft-new-file
+        "r"   #'deft-rename-file
+        "s"   #'deft-toggle-sort-method
+        "t"   #'deft-toggle-incremental-search))