@@ -13,9 +13,9 @@ (put 'inhibit-startup-echo-area-message 'saved-value      (setq inhibit-startup-echo-area-message (user-login-name)))
 (setq inhibit-startup-screen t)
 (setq gc-cons-threshold 100000000)
-(setq file-name-handler-alist-backup file-name-handler-alist
-      file-name-handler-alist nil)
-(remove-hook 'find-file-hooks #'vc-find-file-hook)
+(defvar file-name-handler-alist-backup file-name-handler-alist)
+(setq file-name-handler-alist nil)
+(remove-hook 'find-file-hooks #'vc-refresh-state)
 #+END_SRC
 
 ** Scratch buffers
@@ -144,7 +144,7 @@ (set-face-background 'window-divider "#a1b56c")             (set-face-foreground 'window-divider "#a1b56c")
 
             (defvar mode-line-default-format mode-line-format)
-            (defcustom mode-line-default-hidden nil
+            (defvar mode-line-default-hidden nil
               "Whether to hide the mode line by default")
 
             (defun show-mode-line ()
@@ -501,7 +501,6 @@ (interactive "P")               (ap/open-subfolder-project home-project-directory arg))
 
             (setq projectile-switch-project-action #'projectile-commander
-                  projectile-remember-window-configs t
                   projectile-completion-system 'ivy)))
 #+END_SRC
 
@@ -516,7 +515,7 @@ :defer t   :bind (("C-x v C" . vc-resolve-conflicts))
   :config (progn
             (setq vc-follow-symlinks t)
-            (setq vs-ignore-dir-regexp (format "\\(%s\\)\\|\\(%s\\)"
+            (setq vc-ignore-dir-regexp (format "\\(%s\\)\\|\\(%s\\)"
                                                vc-ignore-dir-regexp
                                                tramp-file-name-regexp))))
 #+END_SRC
@@ -546,10 +545,8 @@ #+BEGIN_SRC emacs-lisp (use-package magit
   :defer 5
   :commands (magit-status)
-  :config (progn (setq magit-last-seen-setup-instructions "1.4.0"
-                       magit-completing-read-function #'ivy-completing-read
+  :config (progn (setq magit-completing-read-function #'ivy-completing-read
                        magit-popup-use-prefix-argument 'default
-                       magit-push-always-verify nil
                        magit-display-buffer-function #'magit-display-buffer-fullcolumn-most-v1
                        global-magit-file-mode nil)
                  (add-to-list 'magit-no-confirm 'safe-with-wip))
@@ -899,9 +896,9 @@ Undo, for window-based commands. 
 #+BEGIN_SRC emacs-lisp
 (use-package winner
+  :config (setq winner-boring-buffers '("*Completions*" "*Help*" "*Apropos*" "*Buffer List*" "*info*" "*Compile-Log*"))
   :init (progn
-          (winner-mode 1)
-          (setq winner-boring-buffers '("*Completions*" "*Help*" "*Apropos*" "*Buffer List*" "*info*" "*Compile-Log*"))))
+          (winner-mode 1)))
 #+END_SRC
 
 ** windmove
@@ -976,9 +973,7 @@ (use-package calendar   :defer 1
   :config (progn
             (setq calendar-week-start-day 1)
-            (calendar-set-date-style 'iso)
-            (setq calendar-latitude 52.52
-                  calendar-longitude 13.40)))
+            (calendar-set-date-style 'iso)))
 #+END_SRC
 
 Sometimes I want to insert a date or time into a buffer.
@@ -1025,8 +1020,7 @@ (bind-key "^" (lambda () (interactive) (find-alternate-file "..")) dired-mode-map)             (setq dired-dwim-target t
                   dired-recursive-copies 'top
                   dired-recursive-deletes 'top
-                  dired-listing-switches "-alh"
-                  dired-bind-jump nil)
+                  dired-listing-switches "-alh")
             (when (and (eq system-type 'darwin) (executable-find "gls"))
               (setq insert-directory-program (executable-find "gls")))
             (put 'dired-find-alternate-file 'disabled nil)))
@@ -1046,7 +1040,8 @@ :ensure nil   :config (progn
             (setq dired-omit-files "#\\|\\.$"
                   dired-omit-verbose nil
-                  dired-find-subdir t))
+                  dired-find-subdir t
+                  dired-bind-jump nil))
   :init (progn
           (add-hook 'dired-mode-hook #'turn-on-dired-omit-mode)))
 #+END_SRC