@@ -102,6 +102,7 @@
 (use-package general
   :functions (general-unbind general-define-key)
   :config (progn
+	    (general-override-mode +1)
             (when (eq system-type 'darwin)
               (general-unbind "s-x"))))
 
@@ -183,12 +184,14 @@ (use-package evil-collection
   :config (evil-collection-init))
 
 (general-create-definer my-leader-def
+  :keymaps 'override
+  :states '(normal motion)
   :prefix ",")
 
 (use-package evil-space
   :defer 1
   :config (progn
-            (evil-space-mode)))
+            (evil-space-mode +1)))
 
 (use-package evil-surround
   :custom ((global-evil-surround-mode t)))
@@ -466,7 +469,7 @@
 ;;; Take me to my leader
 
 (my-leader-def
- :keymaps 'normal
+ "" nil
  "h" '(:keymap ehelp-map)
  "w" '(:keymap evil-window-map)
  "x" '(:keymap ctl-x-map)