diff --git a/init.example.el b/init.example.el
index de99fd8cc..f6c6e3473 100644
--- a/init.example.el
+++ b/init.example.el
@@ -35,7 +35,7 @@
         +defaults)       ; default popup rules
       ;debugger          ; FIXME stepping through code, to help you add bugs
        eval              ; run code, run (also, repls)
-       evil              ; come to the dark side, we have cookies
+       (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        (lookup           ; helps you navigate your code and documentation
         +devdocs         ; ...on devdocs.io online
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index bede221ff..f47562032 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -20,6 +20,18 @@
 (autoload 'goto-last-change "goto-chg")
 (autoload 'goto-last-change-reverse "goto-chg")
 
+
+(def-package! evil-collection
+  :when (featurep! +everywhere)
+  :after evil
+  :preface
+  (setq evil-want-integration nil) ; must be set before evil is loaded
+  :config
+  (evil-collection-init)
+  ;; don't interfere with leader key
+  (map! :after compile :map compilation-mode-map doom-leader-key nil))
+
+
 (def-package! evil
   :init
   (setq evil-want-C-u-scroll t
@@ -62,12 +74,6 @@
     (setq +evil--default-cursor-color (face-background 'cursor)))
   (add-hook 'doom-init-theme-hook #'+evil|update-cursor-color)
 
-  ;; default modes
-  (dolist (mode '(tabulated-list-mode view-mode comint-mode term-mode calendar-mode Man-mode))
-    (evil-set-initial-state mode 'emacs))
-  (dolist (mode '(help-mode debugger-mode grep-mode))
-    (evil-set-initial-state mode 'normal))
-
 
   ;; --- keybind fixes ----------------------
   (map! (:after wgrep
diff --git a/modules/feature/evil/packages.el b/modules/feature/evil/packages.el
index 4194b9bd1..9de021a53 100644
--- a/modules/feature/evil/packages.el
+++ b/modules/feature/evil/packages.el
@@ -4,6 +4,7 @@
 (package! evil)
 (package! evil-args)
 (package! evil-commentary)
+(package! evil-collection)
 (package! evil-easymotion)
 (package! evil-embrace)
 (package! evil-escape)