         evil-search-module #'evil-search)
 
   (setq evil-normal-state-tag   (propertize " N " 'face '((:background "DarkGoldenrod2" :foreground "black")))
-          evil-emacs-state-tag    (propertize " E " 'face '((:background "SkyBlue2"       :foreground "black")))
-          evil-insert-state-tag   (propertize " I " 'face '((:background "chartreuse3"    :foreground "black")))
-          evil-replace-state-tag  (propertize " R " 'face '((:background "chocolate"      :foreground "black")))
-          evil-motion-state-tag   (propertize " M " 'face '((:background "plum3"          :foreground "black")))
-          evil-visual-state-tag   (propertize " V " 'face '((:background "gray"           :foreground "black")))
-          evil-operator-state-tag (propertize " O " 'face '((:background "sandy brown"    :foreground "black"))))
-  :general
-    ("s-j" #'evil-window-down)
-    ("s-k" #'evil-window-up)
-    ("s-h" #'evil-window-left)
-    ("s-l" #'evil-window-right)
-    (:states '(normal visual) :keymaps 'override
-    :prefix "<SPC>"
-      ";"          #'evil-jump-forward
-      ","          #'evil-jump-backward
-      "a"          #'align
-      "f"          #'avy-goto-word-1
-      "g"          #'avy-goto-char-2
-      "<SPC>"      #'avy-goto-char-timer
-      "h"          #'hydra-diff-hl/body
-      "l"          #'avy-goto-char-in-line
-      "p"          #'hydra-paste/body
-      "x"          #'exchange-point-and-mark)
-    (:states '(normal visual) :prefix "<SPC>" :keymaps 'override
-             "s"  (general-simulate-key "\"*" :state 'normal :keymap nil :lookup nil :name me:simulate-selection-reg )
-             "c"  (general-simulate-key "\"+" :state 'normal :keymap nil :lookup nil :name me:simulate-clipboard-reg ))
-    (:keymaps '(normal visual ) "<escape>" #'keyboard-quit)
-
-    ;; Move via visual lines
-    (:keymaps 'normal "j"   #'evil-next-visual-line)
-    (:keymaps 'normal "k"   #'evil-previous-visual-line)
-
-    ;; Scroll keeping cursor stationary
-    (:keymaps '( normal insert visual ) "C-j" #'evil-scroll-line-up)       ; ^y
-    (:keymaps '( normal insert visual )  "C-k" #'evil-scroll-line-down)     ; ^e
-
-    ;; Overload shifts so that they don't lose the selection
-    (:keymaps 'visual
-              ">"           #'me:evil-shift-right-visual
-              "<tab>"       #'me:evil-shift-right-visual)
-    (:keymaps 'visual
-              "<"           #'me:evil-shift-left-visual
-              "<backtab>"   #'me:evil-shift-left-visual)
+        evil-emacs-state-tag    (propertize " E " 'face '((:background "SkyBlue2"       :foreground "black")))
+        evil-insert-state-tag   (propertize " I " 'face '((:background "chartreuse3"    :foreground "black")))
+        evil-replace-state-tag  (propertize " R " 'face '((:background "chocolate"      :foreground "black")))
+        evil-motion-state-tag   (propertize " M " 'face '((:background "plum3"          :foreground "black")))
+        evil-visual-state-tag   (propertize " V " 'face '((:background "gray"           :foreground "black")))
+        evil-operator-state-tag (propertize " O " 'face '((:background "sandy brown"    :foreground "black"))))
+  :general
+  ("s-j" #'evil-window-down)
+  ("s-k" #'evil-window-up)
+  ("s-h" #'evil-window-left)
+  ("s-l" #'evil-window-right)
+  (:states '(normal visual) :keymaps 'override
+           :prefix "<SPC>"
+           ";"          #'evil-jump-forward
+           ","          #'evil-jump-backward
+           "a"          #'align
+           "f"          #'avy-goto-word-1
+           "g"          #'avy-goto-char-2
+           "<SPC>"      #'avy-goto-char-timer
+           "h"          #'hydra-diff-hl/body
+           "l"          #'avy-goto-char-in-line
+           "p"          #'hydra-paste/body
+           "x"          #'exchange-point-and-mark)
+  (:states '(normal visual) :prefix "<SPC>" :keymaps 'override
+           "s"  (general-simulate-key "\"*" :state 'normal :keymap nil :lookup nil :name me:simulate-selection-reg )
+           "c"  (general-simulate-key "\"+" :state 'normal :keymap nil :lookup nil :name me:simulate-clipboard-reg ))
+  (:keymaps '(normal visual ) "<escape>" #'keyboard-quit)
+
+  ;; Move via visual lines
+  (:keymaps 'normal "j"   #'evil-next-visual-line)
+  (:keymaps 'normal "k"   #'evil-previous-visual-line)
+
+  ;; Scroll keeping cursor stationary
+  (:keymaps '( normal insert visual ) "C-j" #'evil-scroll-line-up)       ; ^y
+  (:keymaps '( normal insert visual )  "C-k" #'evil-scroll-line-down)     ; ^e
+
+  ;; Overload shifts so that they don't lose the selection
+  (:keymaps 'visual
+            ">"           #'me:evil-shift-right-visual
+            "<tab>"       #'me:evil-shift-right-visual)
+  (:keymaps 'visual
+            "<"           #'me:evil-shift-left-visual
+            "<backtab>"   #'me:evil-shift-left-visual)
 
   :config
 

  (setq x-underline-at-descent-line t)
  :config
  (let ((line (face-attribute 'mode-line :underline)))
      (set-face-attribute 'mode-line          nil :overline   line)
      (set-face-attribute 'mode-line-inactive nil :overline   line)
      (set-face-attribute 'mode-line-inactive nil :underline  line)
      (set-face-attribute 'mode-line          nil :underline  line)
      (set-face-attribute 'mode-line          nil :box        nil)
      (set-face-attribute 'mode-line-inactive nil :box        nil))
  ;; make mode lines more noticable
  (set-face-attribute 'mode-line nil :background "#4e4e4e" :height 1.1)
  (set-face-attribute 'mode-line-inactive nil :background "#3e3e3e" :height 0.9)

(use-package winner
  :ensure nil
  :general
  ("s-]"   #'winner-redo)
  ("s-["   #'winner-undo)
  :defer 1
  :init
  :config
