                             :background "#00629D" :foreground "#FDF6E3")
                            (((class color) (min-colors 89) (background dark))
                             :background "#69B7F0" :foreground "#002B36")))
+  (set-face-attribute 'dired-header nil :underline t :background nil :foreground nil)
   (set-face-background 'flycheck-fringe-error nil)
   (set-face-background 'flycheck-fringe-info nil)
   (set-face-background 'flycheck-fringe-warning nil)
-  (set-face-attribute 'mode-line nil :overline nil :underline nil :box nil)
-  (set-face-attribute 'mode-line-inactive nil :overline nil :underline nil :box nil)
-  (set-face-attribute 'header-line nil :box nil))
+  (set-face-attribute 'mode-line nil :overline nil :underline nil)
+  (set-face-attribute 'mode-line-inactive nil :overline nil :underline nil)
+  (set-face-attribute 'header-line nil :overline nil :underline nil))

(autoload 'zap-up-to-char "misc")
(bind-key "M-z" 'zap-up-to-char)

(use-package undo-tree
  :config
  ;; Unmap extraneous undo-tree mode keys
  (assq-delete-all 'undo-tree-mode minor-mode-map-alist)
  ;; Map the usual undo key to undo-tree-visualize
  (bind-key "C-x u" 'undo-tree-visualize))

;; Quiet down noisy config gracefully
(use-package shut-up)

;; Move around windows with shifted arrow keys
(use-package windmove
  :config
  (windmove-default-keybindings))

;; Not that I use occur very often, but when I do, I'd like its keybindings the
;; same as grep mode's
(add-hook 'occur-mode-hook

(advice-add 'load-theme :around (lambda (old-load-theme &rest args)
                                  (apply old-load-theme (car args) t (cddr args))))

(package-initialize)

;; Tell Custom to write and find the custom settings elsewhere
(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
