diff --git a/ha-config.org b/ha-config.org
index e881f85..2c3d4cd 100644
--- a/ha-config.org
+++ b/ha-config.org
@@ -347,13 +347,14 @@ I'm not trying an experiment where specially-placed function keys on my fancy er
     :config
     (general-evil-setup t)
     (general-create-definer ha-leader
-      :keymaps '(normal visual)
+      :states '(normal visual motion)
+      :keymaps 'override
       :prefix "SPC"
       :non-normal-prefix "M-SPC"
       :global-prefix "<f13>")
 
     (general-create-definer ha-local-leader
-      :states '(normal visual)
+      :states '(normal visual motion)
       :prefix "SPC m"))
 #+END_SRC
 *** Top-Level Operations
@@ -672,6 +673,18 @@ While the ~C-h~ is easy enough, I am now in the habit of typing ~SPC h~ instead.
     "h i" '("info" . info))
 #+END_SRC
 
+Let's make Info behave a little more VI-like:
+#+BEGIN_SRC emacs-lisp
+  (use-package info
+    :straight (:type built-in)
+    :general
+    (:states 'normal :keymaps 'Info-mode-map
+             "o" 'ace-link-info
+             "b" 'Info-history-back
+             "TAB" 'Info-history-forward
+             "p" 'Info-backward-node
+             "n" 'Info-forward-node))    ; Old habit die hard
+#+END_SRC
 *** Consult Enhancements
 The [[https://github.com/minad/consult][consult]] package is a replacement for selecting buffers and other /speciality functions/, similar to the [[https://oremacs.com/2015/04/09/counsel-completion/][Ivy's counsel completion]] project. I think I may be adding it sparingly, as personally, I read files and buffers based on the selected /project/.
 
diff --git a/ha-org.org b/ha-org.org
index deea699..1e5bc9a 100644
--- a/ha-org.org
+++ b/ha-org.org
@@ -51,9 +51,9 @@ One other helper routine is a =general= macro for org-mode files:
 #+NAME: ha-org-leader
 #+BEGIN_SRC emacs-lisp :tangle no
   (general-create-definer ha-org-leader
-        :states '(normal visual)
-        :keymaps 'org-mode-map
-        :prefix "SPC m")
+      :states '(normal visual motion)
+      :keymaps 'org-mode-map
+      :prefix "SPC m")
 #+END_SRC
 * Initialization Section
 Org is an important part of my Emacs world, and with a lot of customization (even though Spacemacs and Doom do a good job getting things started).
diff --git a/ha-programming.org b/ha-programming.org
index 02895a3..e5cbb7b 100644
--- a/ha-programming.org
+++ b/ha-programming.org
@@ -30,9 +30,9 @@ Seems that all programming interfaces and workflows behave similarly. However...
 One other helper routine is a =general= macro for org-mode files:
 #+BEGIN_SRC emacs-lisp
   (general-create-definer ha-prog-leader
-        :states '(normal visual)
-        :keymaps 'prog-mode-map
-        :prefix "SPC m")
+      :states '(normal visual motion)
+      :keymaps 'prog-mode-map
+      :prefix "SPC m")
 #+END_SRC
 * General
 The following work for all programming languages.