diff --git a/lisp/completion.el b/lisp/completion.el
index ee96094d094adca87fe06b79f798a01209e1fe91..872e0de1df77532e09197f64bb0a7300adf1aa99 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -75,6 +75,7 @@
             (swiper-isearch . ,standard-seaarch-fn)))
 ;;            (t . ,alt-search-fn)) ;; Error when use this line
     )
+  (add-to-list 'user/evil-collection-mode-list 'ivy)
   :config
   (setq ivy-sort-max-size 7500)
 
@@ -98,7 +99,6 @@
   ;;   (define-key map (kbd "C-j") 'ivy-next-line)
   ;;   (define-key map (kbd "C-k") 'ivy-previous-line))
 
-  (add-to-list 'user/evil-collection-mode-list 'ivy)
 
   :bind
   (("C-c s s" . 'swiper)
diff --git a/lisp/configs.el b/lisp/configs.el
index a57c0d4e8064884ffcdf0a351e0970ea9d48c592..b1bd58505d457ca243beac4a72feba91967207a0 100644
--- a/lisp/configs.el
+++ b/lisp/configs.el
@@ -74,12 +74,24 @@
 If `lsp-mode' use lsp-mode as lsp client.")
 
 (defvar user/evil-collection-mode-list
-  '(bookmark
-    calc calendar
-    diff-mode dired doc-view edebug ediff elisp-mode eww finder grep help ibuffer
-    (package-menu package)
-    popup proced
-    xwidget)
+  '(ag apropos bm bookmark
+       (buff-menu "buff-menu")
+       calc calendar
+       cus-theme debug dictionary diff-mode dired dired-sidebar disk-usage doc-view docker ebib edbi edebug ediff eglot explain-pause-mode elfeed elisp-mode elisp-refs elisp-slime-nav emms epa ert eshell eval-sexp-fu evil-mc eww finder flycheck flymake free-keys geiser ggtags git-timemachine gnus go-mode grep guix hackernews helm help helpful hg-histedit hungry-delete ibuffer image image-dired image+ imenu imenu-list
+       (indent "indent")
+       lispy log-edit log-view lsp-ui-imenu man magit magit-todos neotree nov
+       (occur replace)
+       org-present outline
+       (package-menu package)
+       pass
+       (pdf pdf-view)
+       popup proced
+       (process-menu simple)
+       prodigy profiler python quickrun realgud reftex restclient rg ripgrep scroll-lock sh-script simple slime sly speedbar tab-bar tablist tabulated-list tar-mode
+       (term term ansi-term multi-term)
+       tetris thread timer-list vc-annotate vc-dir vc-git vdiff view vlf vterm wdired wgrep which-key woman xref
+       (ztree ztree-diff)
+       xwidget)
   )
 
 
diff --git a/lisp/core-libs.el b/lisp/core-libs.el
index 3a824e6d1cf7b3125a286ecf72d0658e8d75e3be..d03b0cc01f930e6dd62bde7ff25d4a667c477102 100644
--- a/lisp/core-libs.el
+++ b/lisp/core-libs.el
@@ -42,7 +42,9 @@ If INITIAL-DIRECTORY is non nil start in that directory."
 
 (defun user/lazy-load ()
   "Load after everything."
-  (evil-collection-init 'user/evil-collection-mode-list)
+  (interactive)
+  (setq evil-collection-mode-list nil)
+  (evil-collection-init user/evil-collection-mode-list)
   )
 
 (provide 'core-libs)
diff --git a/lisp/editor.el b/lisp/editor.el
index 9c0c51253f746de1cb7d8a2573fd9abc4c5d3439..36a1493b2027e2ac535c409c4983605d272d44b7 100644
--- a/lisp/editor.el
+++ b/lisp/editor.el
@@ -92,6 +92,9 @@
 (use-package evil-collection
   :after evil
   :ensure t
+  :custom
+  (evil-collection-setup-minibuffer t)
+  (evil-collection-mode-list nil)
   )
 
 ;;; General - for keybindings
@@ -202,12 +205,6 @@
     (push '("*Google Translate*"     :dedicated t :position bottom :stick t :noselect t   :height 0.4) popwin:special-display-config)
     ))
 
-(use-package popup
-  :ensure t
-  :config
-  (add-to-list 'user/evil-collection-mode-list 'popup)
-  )
-
 
 ;;; Modeline
 (use-package doom-modeline
diff --git a/lisp/prog-common.el b/lisp/prog-common.el
index e2df25487fc2c6f9429eec321f09e7c05f22b307..840d77de054301e1abd9b15c6976bf97d854387c 100644
--- a/lisp/prog-common.el
+++ b/lisp/prog-common.el
@@ -66,15 +66,15 @@
 (use-package company-mode
   :ensure company
   :hook prog-mode
-  :config
-  (progn
-    (setq company-idle-delay 0.2)
-    (setq company-minimum-prefix-length 2)
-    (setq tab-always-indent 'complete)
-    (setq-default company-backends (delete 'company-semantic company-backends))
-    (push '(company-semantic :with company-yasnippet) company-backends))
-
+  :custom
+  (company-idle-delay 0.2)
+  (company-minimum-prefix-length 2)
+  (tab-always-indent 'complete)
+  :init
   (add-to-list 'user/evil-collection-mode-list 'company)
+  :config
+  (setq-default company-backends (delete 'company-semantic company-backends))
+  (push '(company-semantic :with company-yasnippet) company-backends)
   :diminish company-mode
   )