@@ -170,9 +170,9 @@ #+BEGIN_SRC emacs-lisp
   (use-package diff-hl
     :defer 2
-    :init (progn
-            (global-diff-hl-mode 1)
-            (add-hook 'magit-refresh-file-buffer-hook #'diff-hl-update)))
+    :config (progn
+              (global-diff-hl-mode 1)
+              (add-hook 'magit-refresh-file-buffer-hook #'diff-hl-update)))
 #+END_SRC
 
 ** magit
@@ -219,9 +219,11 @@ #+BEGIN_SRC emacs-lisp
   (when (and menu-bar-mode (not (eq window-system 'ns)))
     (menu-bar-mode -1))
-  (when scroll-bar-mode
-    (scroll-bar-mode -1)
-    (tooltip-mode -1)
+  (with-eval-after-load 'scroll-bar
+    (set-scroll-bar-mode nil))
+  (with-eval-after-load 'tooltip
+    (tooltip-mode -1))
+  (with-eval-after-load 'tool-bar
     (tool-bar-mode -1))
 #+END_SRC
 
@@ -678,8 +680,9 @@ ** Relative Buffer names 
 #+BEGIN_SRC emacs-lisp
   (use-package relative-buffers
-    :init (progn
-            (global-relative-buffers-mode)))
+    :defer 15
+    :config (progn
+              (global-relative-buffers-mode)))
 #+END_SRC
 ** Narrowing
 
@@ -1627,9 +1630,10 @@ On-the-fly error checking in programming modes?  Yes please.
 
 #+BEGIN_SRC emacs-lisp
-(use-package flycheck
-  :diminish " ✓"
-  :init (global-flycheck-mode))
+  (use-package flycheck
+    :diminish " ✓"
+    :defer 5
+    :config (global-flycheck-mode))
 #+END_SRC
 
 ** golang