@@ -3,7 +3,9 @@ initial-scratch-message ""
       initial-major-mode 'text-mode
       package-enable-at-startup nil)
 
-(eval-when-compile (require 'use-package))
+(eval-when-compile
+  (require 'use-package)
+  (setq use-package-expand-minimally t))
 (setq use-package-always-demand (daemonp))
 
 ;;; Customize
@@ -106,6 +108,7 @@ (use-package avy
   :custom ((avy-all-windows nil)))
 (use-package ace-link
   :after avy
+  :commands (ace-link-setup-default)
   :config (ace-link-setup-default))
 
 ;; Popup keybindings following a prefix automatically.
@@ -131,6 +134,7 @@ (use-package amx
     :custom ((amx-history-length 100))))
 
 (use-package counsel
+  :commands (counsel-unicode-char)
   :general ("M-x" #'counsel-M-x))
 
 ;;; Minibuffer
@@ -167,6 +171,7 @@ ;;; Evil
 
 (use-package evil
   :demand t
+  :commands (evil-mode evil-delete-buffer)
   :after (undo-tree)
   :init (progn
 	  (defvar evil-want-integration)
@@ -174,16 +179,17 @@ (defvar evil-want-keybinding)
 	  (setq evil-want-integration t
 		evil-want-keybinding nil))
   :custom ((evil-shift-width 2)
-           (evil-mode-line-format '(before . mode-line-front-space)))
+	   (evil-mode-line-format '(before . mode-line-front-space)))
+  :config (evil-mode +1)
   :general
   (:states 'motion
-           "C-;" #'evil-avy-goto-line)
+	   "C-;" #'evil-avy-goto-line)
   (:states 'normal
-           ";" #'evil-ex)
-  :config (progn
-            (evil-mode +1)))
+	   ";" #'evil-ex))
 
 (use-package evil-collection
+  :after evil
+  :commands (evil-collection-init)
   :custom ((evil-collection-company-use-tng nil))
   :config (evil-collection-init))
 
@@ -194,28 +200,33 @@ :prefix ",")
 
 (use-package evil-space
   :defer 1
-  :config (progn
-            (evil-space-mode +1)))
+  :after evil
+  :custom ((evil-space-mode t)))
 
 (use-package evil-surround
+  :after evil
   :custom ((global-evil-surround-mode t)))
 
 (use-package evil-commentary
+  :after evil
   :custom ((evil-commentary-mode t)))
 
 (use-package evil-magit
-  :after magit
+  :after (evil magit)
   :custom ((evil-magit-use-y-for-yank nil)))
 
 (use-package evil-quickscope
+  :after evil
   :custom ((global-evil-quickscope-mode t)))
 
 (use-package evil-org
+  :after evil
   :commands (evil-org-set-key-theme)
   :ghook ('org-mode-hook #'evil-org-mode)
   :gfhook #'evil-org-set-key-theme)
 
 (use-package evil-org-agenda
+  :after evil
   :ghook ('org-agenda-mode-hook #'evil-org-agenda-set-keys))
 
 ;;; Projects
@@ -226,10 +237,12 @@ :custom ((projectile-mode +1)
            (projectile-completion-system 'ivy)))
 
 (use-package counsel-projectile
+  :commands (counsel-projectile-switch-project)
   :after (counsel projectile ivy-hydra)
   :custom ((counsel-projectile-mode +1)))
 
 (use-package magit
+  :commands (magit-status magit-dispatch)
   :custom ((global-magit-file-mode +1)
            (magit-completing-read-function #'ivy-completing-read)))
 
@@ -250,6 +263,7 @@ ".XXX....")
             (setq git-gutter-fr:side 'right-fringe)))
 
 (use-package git-messenger
+  :commands (git-messenger:popup-message)
   :defer 5
   :custom ((git-messenger:use-magit-popup t)))
 
@@ -264,6 +278,7 @@
 ;;; Completion
 
 (use-package company
+  :commands (company-explicit-action-p)
   :custom ((global-company-mode +1)
            (company-idle-delay .2)
            (company-begin-commands '(self-insert-command))
@@ -272,6 +287,7 @@ (company-auto-complete-chars '(?\ ?\( ?\) ?.)))
   :general (:states 'insert
                     "TAB" #'company-complete))
 
+(use-package all-the-icons)
 (use-package company-box
   :custom ((company-box-enable-icon nil))
   :ghook 'company-mode-hook)
@@ -332,9 +348,6 @@ (call-process (executable-find "trash")
                       nil 0 nil
                       file))))
 
-(use-package undo-tree
-  :defer 1
-  :config (global-undo-tree-mode))
 (use-package goto-chg
   :defer 1)