           :n  "M-a" 'org-mark-element
           :v  "M-a" 'mark-whole-buffer
 
-          :ni "<M-return>"   (@λ (doom/org-insert-item 'below))
-          :ni "<S-M-return>" (@λ (doom/org-insert-item 'above))
+          :ni "<M-return>"   (@λ (+org/insert-item 'below))
+          :ni "<S-M-return>" (@λ (+org/insert-item 'above))
 
           ;; Formatting shortcuts
-          :i  "M-b" (@λ (doom/org-surround "*")) ; bold
-          :i  "M-u" (@λ (doom/org-surround "_")) ; underline
-          :i  "M-i" (@λ (doom/org-surround "/")) ; italics
-          :i  "M-`" (@λ (doom/org-surround "+")) ; strikethrough
+          :i  "M-b" (@λ (+org-surround "*")) ; bold
+          :i  "M-u" (@λ (+org-surround "_")) ; underline
+          :i  "M-i" (@λ (+org-surround "/")) ; italics
+          :i  "M-`" (@λ (+org-surround "+")) ; strikethrough
 
           :v  "M-b" "S*"
           :v  "M-u" "S_"

           :n  "a"  'org-agenda
           :n  "d"  'org-time-stamp
           :n  "e"  'org-edit-special
           :n  "i"  'doom/org-toggle-inline-images-at-point
           :n  "l"  'org-insert-link
           :n  "n"  (@λ (if (buffer-narrowed-p) (widen) (org-narrow-to-subtree)))
           :n  "r"  'org-refile


          (:localleader
           :n  "RET" 'org-archive-subtree
           :n  "SPC" '+org/toggle-checkbox
           :n  "/"  'org-sparse-tree
           :n  "="  'org-align-all-tags
           :n  "?"  'org-tags-view
