         ;; Lookup
         ("C-c l t" . haskell-process-do-type)
         ("C-c l i" . haskell-process-do-info)
-        ;; Hare
-        ("C-c h d m" . hare-refactor-demote)
-        ("C-c h d d" . hare-refactor-dupdef)
-        ("C-c h i c" . hare-refactor-iftocase)
-        ("C-c h l o" . hare-refactor-lift-one)
-        ("C-c h l t" . hare-refactor-lifttotop)
-        ("C-c h r"   . hare-refactor-rename)
-        ("C-c h t"   . hare-refactor-roundtrip)
-        ("C-c h s h" . hare-refactor-show))
+        ;; Refactor - Hare
+        ("C-c r d m" . hare-refactor-demote)
+        ("C-c r d d" . hare-refactor-dupdef)
+        ("C-c r i c" . hare-refactor-iftocase)
+        ("C-c r l o" . hare-refactor-lift-one)
+        ("C-c r l t" . hare-refactor-lifttotop)
+        ("C-c r r"   . hare-refactor-rename)
+        ("C-c r t"   . hare-refactor-roundtrip)
+        ("C-c r s h" . hare-refactor-show))
   :init
   (add-hook 'haskell-mode-hook
             '(lambda () (progn
                           (intero-mode)
                           (intero-mode-whitelist)
                           (intero-mode-blacklist)
-                          (structured-haskell-mode)
                           (hlint-refactor-mode)
                           (haskell-decl-scan-mode)
                           (flyckeck-haskell-configure)
                           (turn-on-haskell-doc-mode)
-                          (turn-on-haskell-indent)
+                          (haskell-indentation-mode)
                           (electric-indent-local-mode -1)
                           (rainbow-delimiters-mode)
                           (speedbar-add-supported-extension ".hs")

  ("\\.c2hs\\'"  . haskell-mode)
  :bind
  (:map haskell-mode-map
        ("M-<right>" . haskell-move-nested-right)
        ("M-<left>"  . haskell-move-nested-left)
        ("C-c ."     . counsel-dash-at-point)
        ;; Editing
        ("C-c e j" . haskell-navigate-imports)
        ("C-c e f" . haskell-mode-format-imports)

        company-ghc-show-info t)
  ;; Which-key
  (mapcar (lambda (mode) (which-key-add-major-mode-key-based-replacements mode
                      "C-c d" "debug"
                      "C-c e" "editing"
                      "C-c i" "interpreter"
                      "C-c l" "lookup"
                      "C-c r" "refactor"))
          [haskell-mode literate-haskell-mode]))

(use-package intero
