 
 (defun spacemacs/init-savehist ()
   (use-package savehist
-    :defer t
     :init
     (progn
       ;; Minibuffer history
       (setq savehist-file (concat spacemacs-cache-directory "savehist")
             enable-recursive-minibuffers t ; Allow commands in minibuffers
             history-length 1000
-            savehist-additional-variables '(mark-ring global-mark-ring search-ring regexp-search-ring extended-command-history)
+            savehist-additional-variables '(mark-ring
+                                            global-mark-ring
+                                            search-ring
+                                            regexp-search-ring
+                                            extended-command-history)
             savehist-autosave-interval 60)
       (savehist-mode t))))
 
 (defun spacemacs/init-saveplace ()
   (use-package saveplace
-    :demand t
     :init
     (progn
       ;; Save point position between sessions


(defun spacemacs/init-evil-iedit-state ()
  (use-package evil-iedit-state
    :defer t
    :init
    (progn
      (evil-leader/set-key "se" 'evil-iedit-state)


(defun spacemacs/init-window-numbering ()
  (use-package window-numbering
    :config
    (progn
      (when (configuration-layer/package-usedp 'powerline)
