@@ -238,8 +238,6 @@ " "                           filename-and-process)))))
 
 (use-package uniquify
-  :defer t
-  :idle (require 'uniquify)
   :config (progn
             (setq uniquify-buffer-name-style 'reverse
                   uniquify-separator "/"
@@ -325,18 +323,15 @@ (use-package eldoc-context   :bind (("C-c h" . rgr/toggle-context-help)))
 
 (use-package which-func
-  :defer t
-  :idle (which-function-mode)
-  :init (setq which-func-modes t))
+  :init (which-function-mode)
+  :config (setq which-func-modes t))
 
 ;;;; Files
 
 (prefer-coding-system 'utf-8-auto-unix)
 (set-default-coding-systems 'utf-8-auto-unix)
 (setq-default buffer-file-coding-system 'utf-8-auto-unix)
-(use-package autorevert
-  :defer t
-  :idle (global-auto-revert-mode 1))
+(global-auto-revert-mode 1)
 
 (add-hook 'before-save-hook #'delete-trailing-whitespace)
 
@@ -374,8 +369,6 @@ (kill-buffer buffer)           (message "File '%s' successfully removed" filename))))))
 
 (use-package saveplace
-  :defer t
-  :idle (require 'saveplace)
   :config (progn (setq-default save-place t)
                  (setq save-place-file (expand-file-name ".saveplace" user-emacs-directory))))
 
@@ -463,9 +456,7 @@ ;;;; Minibuffer
 
 (setq enable-recursive-minibuffers t)
-(use-package mb-depth
-  :defer t
-  :idle (minibuffer-depth-indicate-mode t))
+(minibuffer-depth-indicate-mode t)
 
 (if (daemonp)
     (defalias 'exit-emacs #'delete-frame)
@@ -821,8 +812,6 @@ ("C-M-n" . smart-forward))) 
 (use-package undo-tree
   :ensure t
-  :idle (require 'undo-tree)
-  :defer t
   :config (progn
             (global-undo-tree-mode)
             ;; Keep region when undoing in region