diff --git a/modules/editor/evil/+everywhere.el b/modules/editor/evil/+everywhere.el
index fddfa9fb3..1947d26ce 100644
--- a/modules/editor/evil/+everywhere.el
+++ b/modules/editor/evil/+everywhere.el
@@ -52,7 +52,7 @@ variable for an explanation of the defaults (in comments). See
 ;; (with-current-buffer
 ;;     (url-retrieve-synchronously "https://raw.githubusercontent.com/emacs-evil/evil-collection/master/evil-collection.el" t t)
 ;;   (goto-char (point-min))
-;;   (when (re-search-forward "^(defcustom evil-collection-mode-list\n[^(]+")
+;;   (when (re-search-forward "^(defvar evil-collection--supported-modes\n[^(]+")
 ;;     (let ((list (sexp-at-point)))
 ;;       ;; Fixes
 ;;       (when (assq 'pdf list)
@@ -64,6 +64,7 @@ variable for an explanation of the defaults (in comments). See
     ag
     alchemist
     anaconda-mode
+    apropos
     arc-mode
     bookmark
     (buff-menu "buff-menu")
@@ -74,7 +75,7 @@ variable for an explanation of the defaults (in comments). See
     comint
     company
     compile
-    custom
+    (custom cus-edit)
     cus-theme
     daemons
     deadgrep
@@ -84,6 +85,7 @@ variable for an explanation of the defaults (in comments). See
     dired
     disk-usage
     doc-view
+    docker
     ebib
     edbi
     edebug
@@ -134,15 +136,14 @@ variable for an explanation of the defaults (in comments). See
     man
     magit
     magit-todos
-    ,@(when evil-collection-setup-minibuffer '(minibuffer))
+    ,@(if evil-collection-setup-minibuffer '(minibuffer))
     monky
     mu4e
     mu4e-conversation
     neotree
     notmuch
     nov
-    ;; occur is in replace.el which was built-in before Emacs 26.
-    (occur ,(if (<= emacs-major-version 25) "replace" 'replace))
+    (occur replace)
     omnisharp
     outline
     p4
@@ -162,11 +163,12 @@ variable for an explanation of the defaults (in comments). See
     restclient
     rjsx-mode
     robe
-    ruby-mode
     rtags
+    ruby-mode
     simple
     slime
     sly
+    tablist
     (term term ansi-term multi-term)
     tetris
     tide