diff --git a/modules/private/hlissner/+bindings.el b/modules/private/hlissner/+bindings.el
index 2aa1addfe..cc017d040 100644
--- a/modules/private/hlissner/+bindings.el
+++ b/modules/private/hlissner/+bindings.el
@@ -96,31 +96,29 @@
    :desc "Open file explorer"       :n "n"  #'+evil/neotree
    :desc "Insert from kill ring"    :n "y"  #'counsel-yank-pop
    :desc "Switch project"           :n "p"  #'projectile-switch-project
-   :desc "Find snippet for mode"    :n "s"  #'yas-visit-snippet-file
-   :desc "Find snippet"             :n "S"  #'+hlissner/find-in-snippets
    :desc "Execute in Emacs mode"    :n "\\" #'evil-execute-in-emacs-state
    :desc "Switch to Emacs mode"     :n "|"  #'evil-emacs-state
    ;; Since I've remapped C-h...
    :desc "Help"                     :n "h"  #'help-command
 
-   (:desc "Session/Workspace"
-     :prefix "w"
-     :desc "Load last session"      :n "l" (λ! (+workspace/load-session))
-     :desc "Load session"           :n "L" #'+workspace/load-session
-     :desc "Save session"           :n "s" #'+workspace/save-session
-     :desc "Delete session"         :n "X" #'+workspace/kill-session
-     :desc "Load workspace"         :n "L" #'+workspace/load
-     :desc "Save workspace"         :n "L" #'+workspace/save
-     :desc "Delete workspace"       :n "x" #'+workspace/delete
-     :desc "Switch workspace"       :n "." #'+workspace/switch-to
-     :desc "Kill all buffers"       :n "x" #'doom/kill-all-buffers)
-
-   (:desc "Quit"
+   (:desc "quit"
      :prefix "q"
      :desc "Quit"                   :n "q" #'evil-save-and-quit
      :desc "Quit (forget session)"  :n "Q" #'+workspace/kill-session-and-quit)
 
-   (:desc "Toggle"
+   (:desc "session"
+     :prefix "s"
+     :desc "Kill all buffers"         :n "k" #'doom/kill-all-buffers
+     :desc "Load last session"        :n "r" (λ! (+workspace/load-session))
+     :desc "Load workspace from file" :n "l" #'+workspace/load
+     :desc "Save workspace to file"   :n "s" #'+workspace/save
+     :desc "Switch workspace"         :n "." #'+workspace/switch-to
+     :desc "Delete this workspace"    :n "x" #'+workspace/delete
+     :desc "Load session"             :n "L" #'+workspace/load-session
+     :desc "Autosave current session" :n "S" #'+workspace/save-session
+     :desc "Delete session"           :n "X" #'+workspace/kill-session)
+
+   (:desc "toggle"
      :prefix "t"
      :desc "Spell check"            :n "s" #'flyspell-mode
      :desc "Line numbers"           :n "l" #'doom/toggle-line-numbers
@@ -128,16 +126,10 @@
      :desc "Indent guides"          :n "i" #'highlight-indentation-mode
      :desc "Indent guides (column)" :n "I" #'highlight-indentation-current-column-mode
      :desc "Impatient mode"         :n "h" #'+present/impatient-mode
-     :desc "Big mode"               :n "b" #'+present/big-mode)
+     :desc "Big mode"               :n "b" #'+present/big-mode
+     :desc "Git time machine"       :n "t" #'git-timemachine-toggle)
 
-   (:desc "Tmux/Terminal"
-     :prefix "T"
-     :desc "cd to here"             :n "." #'+tmux/cd-to-here
-     :desc "cd to project"          :n "/" #'+tmux/cd-to-project
-     ;; TODO :desc "ssh into..."    :n "/" '+tmux/ssh
-     :desc "send selection"         :v "r" #'+tmux/send-region)
-
-   (:desc "SSH/FTP"
+   (:desc "remote"
      :prefix "u"
      :desc "Upload local"           :n "u" #'+upload/local
      :desc "Upload local (force)"   :n "U" (λ! (+upload/local t))
@@ -146,9 +138,23 @@
      :desc "Browse remote files"    :n "." #'+upload/browse
      :desc "Detect remote changes"  :n "." #'+upload/check-remote)
 
-   (:desc "Open with"
+   (:desc "open"
      :prefix "o"
-     :desc "Default browser"        :n "b" #'browse-url-of-file
+     :desc "Default browser"         :n  "o" #'browse-url-of-file
+     :desc "Debugger"                :n  "d" #'+debug/open
+     :desc "Build tasks"             :n  "b" #'+eval/build
+     :desc "REPL"                    :n  "r" #'+eval:repl
+     :desc "Send to REPL"            :v  "r" #'+eval:repl
+     :desc "Sudo"                    :n  "s" #'doom/sudo-this-file
+     :desc "Terminal"                :n  "t" #'+term/popup
+     :desc "Terminal @ project root" :n  "T" #'+term/popup-in-project
+
+     ;; applications
+     :desc "APP: elfeed"            :n "r"   #'=rss
+     :desc "APP: email"             :n "e"   #'=email
+     :desc "APP: twitter"           :n "t"   #'=twitter
+
+     ;; macos
      (:when IS-MAC
        :desc "Reveal in Finder"          :n "o" #'+macos/reveal
        :desc "Reveal project in Finder"  :n "O" #'+macos/reveal-project
@@ -157,12 +163,6 @@
        :desc "Send to Launchbar"         :n "l" #'+macos/send-to-launchbar
        :desc "Send project to Launchbar" :n "L" #'+macos/send-project-to-launchbar))
 
-   (:desc "Code tools"
-     :prefix "c"
-     :desc "Build"                  :n  "b"  #'+eval/build
-     :desc "Open/Send to REPL"      :nv "r"  #'+eval:repl
-     :desc "Open debugger"          :n  "R"  #'+debug/open)
-
    (:desc "Personal"
      :prefix "SPC"
      :desc "Browse emacs.d"         :n "."   #'+hlissner/browse-emacsd
@@ -176,10 +176,9 @@
      :desc "Browse project notes"   :n "p"   #'+org/browse-notes-for-project
      :desc "Browse mode notes"      :n "m"   #'+org/browse-notes-for-major-mode
      :desc "Org Capture"            :n "SPC" #'+org/capture
-     ;; applications
-     :desc "APP: elfeed"            :n "r"   #'=rss
-     :desc "APP: email"             :n "e"   #'=email
-     :desc "APP: twitter"           :n "t"   #'=twitter
+     ;; misc
+     :desc "Find snippet for mode"  :n "s"  #'yas-visit-snippet-file
+     :desc "Find snippet"           :n "S"  #'+hlissner/find-in-snippets
      ))
 
  (:localleader
@@ -191,9 +190,6 @@
   (:desc "Unit tests"  :prefix "t"))
 
  ;;; Evil-esque bindings
- ;; Folding
- :n  "zr" #'+evil:open-folds-recursively
- :n  "zm" #'+evil:close-folds-recursively
  :n  "zx" #'doom/kill-this-buffer
  ;; Buffers
  :n  "ZX" #'bury-buffer
@@ -219,7 +215,6 @@
  :nv "K"  #'smart-up
  :m  "gd" #'+jump/definition
  :m  "gD" #'+jump/references
- :n  "gf" #'find-file-at-point
  :n  "gp" #'+evil/reselect-paste
  :n  "gc" #'evil-commentary
  :n  "gx" #'evil-exchange
@@ -230,13 +225,11 @@
  :m  "g[" #'smart-backward
  :v  "@"  #'+evil:macro-on-all-lines
  :n  "g@" #'+evil:macro-on-all-lines
- ;; Repeat in visual mode (buggy)
+ ;; repeat in visual mode (buggy)
  :v  "."  #'evil-repeat
- :v  "<"  #'+evil/visual-dedent     ; vnoremap < <gv
- :v  ">"  #'+evil/visual-indent     ; vnoremap > >gv
- ;; undo/redo for regions (buggy)
- :nv "u"   #'undo-tree-undo
- :nv "C-r" #'undo-tree-redo
+ ;; don't leave visual mode after shifting
+ :v  "<"  #'+evil/visual-dedent  ; vnoremap < <gv
+ :v  ">"  #'+evil/visual-indent  ; vnoremap > >gv
  ;; paste from recent yank register (which isn't overwritten)
  :v  "C-p" "\"0p"
 
@@ -311,7 +304,13 @@
  (:map help-mode-map
    :n "]]"  #'help-go-forward
    :n "[["  #'help-go-back
-   :n "o"   #'ace-link-help))
+   :n "o"   #'ace-link-help)
+
+ (:map help-map
+   "l" #'find-library
+   "L" #'view-lossage
+   "h" #'describe-face  ; overwrite `view-hello-file'
+   "g" nil)) ; annoying to accidentally trigger
 
 
 ;;
@@ -387,11 +386,5 @@
         "M-z" #'doom-minibuffer-undo)
 
       (:after view
-        (:map view-mode-map "<escape>" #'View-quit-all))
-
-      (:map help-map
-        "l" #'find-library
-        "L" #'view-lossage
-        "h" #'describe-face  ; overwrite `view-hello-file'
-        "g" nil))
+        (:map view-mode-map "<escape>" #'View-quit-all)))