diff --git a/config.org b/config.org
index ba66ab4..a60ad65 100644
--- a/config.org
+++ b/config.org
@@ -136,7 +136,8 @@ Configure treemacs, doing the following:
 #+begin_src emacs-lisp
 (after! treemacs
   (setq treemacs-width 28)
-  (bind-key "M-0" #'treemacs-select-window))
+  ;; (bind-key "M-0" #'treemacs-select-window)
+  )
 #+end_src
 ** Alert
 Configure notifications that originate from within emacs
@@ -194,14 +195,16 @@ Smarter replacements for emacs built ins, with the following in use:
 
 #+begin_src emacs-lisp
 (use-package! crux
-  :bind (("C-k"   . crux-smart-kill-line)))
+   ;; :bind (("C-k"   . crux-smart-kill-line))
+  )
 #+end_src
 ** string-inflection
 Automatically cycle case of names
 #+begin_src emacs-lisp
 (global-unset-key (kbd "C-q"))
 (use-package! string-inflection
-  :bind (("C-q" . string-inflection-all-cycle)))
+  ;; :bind (("C-q" . string-inflection-all-cycle))
+  )
 (cheatsheet-add-group 'string-inflection
                       '(:key "C-q" :description "Rotate case"))
 #+end_src
@@ -209,14 +212,16 @@ Automatically cycle case of names
 Gobble up whitespace in a smarter way
 #+begin_src emacs-lisp
 (use-package! smart-hungry-delete
-  :bind (("M-<backspace>" . smart-hungry-delete-backward-char)))
+  ;; :bind (("M-<backspace>" . smart-hungry-delete-backward-char))
+  )
 #+end_src
 ** Search
 *** Deadgrep
 Ripgrep, but from within emacs
 #+begin_src emacs-lisp
 (use-package! deadgrep
-  :bind ("C-c s r" . deadgrep))
+  ;; :bind ("C-c s r" . deadgrep)
+  )
 #+end_src
 ** Spell Checking
 Add in all of our dictionaries
@@ -227,7 +232,8 @@ Add in all of our dictionaries
               (spell-fu-dictionary-add (spell-fu-get-ispell-dictionary "en"))
               (spell-fu-dictionary-add (spell-fu-get-ispell-dictionary "en-science"))
               (spell-fu-dictionary-add (spell-fu-get-ispell-dictionary "en-computers"))))
-  (bind-key "C-." #'+spell/correct))
+  ;; (bind-key "C-." #'+spell/correct)
+  )
 #+end_src
 * Org Mode
 Improvements to the best mode in emacs
@@ -401,15 +407,15 @@ Here we:
   :custom
   (org-roam-directory (concat org-directory "Roam/"))
   (org-roam-complete-everywhere t)
-  :bind (("C-c r l" . org-roam-buffer-toggle)
-         ("C-c r f" . org-roam-node-find)
-         ("C-c r g" . org-roam-graph)
-         ("C-c r i" . org-roam-node-insert)
-         ("C-c r c" . org-roam-capture)
-         ("C-c r T" . org-roam-dailies-capture-today)
-         ("C-c r t" . org-roam-dailies-goto-today)
-         :map org-mode-map
-         ("C-M-i" . completion-at-point))
+  ;; :bind (("C-c r l" . org-roam-buffer-toggle)
+  ;;        ("C-c r f" . org-roam-node-find)
+  ;;        ("C-c r g" . org-roam-graph)
+  ;;        ("C-c r i" . org-roam-node-insert)
+  ;;        ("C-c r c" . org-roam-capture)
+  ;;        ("C-c r T" . org-roam-dailies-capture-today)
+  ;;        ("C-c r t" . org-roam-dailies-goto-today)
+  ;;        :map org-mode-map
+  ;;        ("C-M-i" . completion-at-point))
   :config
   (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
   (org-roam-db-autosync-mode)
@@ -649,8 +655,9 @@ in
 Add ergonomic support for multiple vterm terminals
 #+begin_src emacs-lisp
 (use-package! multi-vterm
-  :bind (("C-c o M" . multi-vterm)
-         ("C-c o m" . multi-vterm-project)))
+  ;; :bind (("C-c o M" . multi-vterm)
+  ;;        ("C-c o m" . multi-vterm-project))
+  )
 #+end_src
 * Programming
 ** General Editing
@@ -660,9 +667,9 @@ Edit indirect for comments
 Set the default mode to github flavored markdown, turn on smart use of fill column, and bind to the normal edit-indirect keybinding.
 #+begin_src emacs-lisp
 (use-package! separedit
-  :bind
-  (:map prog-mode-map
-   ("C-c '" . separedit))
+  ;; :bind
+  ;; (:map prog-mode-map
+  ;;  ("C-c '" . separedit))
   :config
   (setq separedit-default-mode 'gfm-mode
         separedit-continue-fill-column t))
@@ -783,8 +790,9 @@ The goal here is to create a more pretty and fluid composition environment for p
 Provide a live, rendered preview when editing markdown readmes using [[https://github.com/joeyespo/grip][grip]].
 #+begin_src emacs-lisp
 (use-package! grip-mode
-  :bind (:map markdown-mode-command-map
-         ("g" . grip-mode)))
+  ;; :bind (:map markdown-mode-command-map
+  ;;             ("g" . grip-mode))
+  )
 #+end_src
 ** Plantuml mode
 Dial down the indent
@@ -806,7 +814,7 @@ Use ~elfeed~ for RSS. Doom provides most of the configuration, but we'll make a
   :hook (elfeed-search-mode . elfeed-update)
   :hook (elfeed-show-mode . variable-pitch-mode)
   :hook (elfeed-show-mode . visual-line-mode)
-  :bind ("C-x w" . elfeed)
+  ;; :bind ("C-x w" . elfeed)
   :config
   (setq elfeed-search-filter "@4-weeks-ago +unread"
         elfeed-db-directory (concat org-directory "elfeed/db/")
diff --git a/init.el b/init.el
index a608ca7..22ade59 100644
--- a/init.el
+++ b/init.el
@@ -35,6 +35,7 @@
        zen                              ; distraction-free coding or writing
 
        :editor
+       (evil +everywhere)
        file-templates                   ; auto-snippets for empty files
        fold                             ; (nigh) universal code folding
        (format +onsave)                 ; automated prettiness