diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
index 38e15964..94f9378d 100644
--- a/.config/nvim/spell/en.utf-8.add
+++ b/.config/nvim/spell/en.utf-8.add
@@ -127,3 +127,4 @@ PipeWire
 neovide
 Fullscreen
 dh
+colemak
diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl
index 6d7bb9c8..b0dcb64c 100644
Binary files a/.config/nvim/spell/en.utf-8.add.spl and b/.config/nvim/spell/en.utf-8.add.spl differ
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index ffc4324a..1c3bc817 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -52,12 +52,22 @@ set -g @plugin 'tmux-plugins/tmux-yank'
 # pretty minimal status
 set -g @plugin 'niksingh710/minimal-tmux-status'
 
+# Theme Settings
+set -g @minimal-tmux-use-arrow false
+set -g @minimal-tmux-status "top"
+set -g @minimal-tmux-right true
+set -g @minimal-tmux-justify "centre"
+set -g @minimal-tmux-bg "#933737"
+set -g @minimal-tmux-fg "#000000"
+
 ### Session management -- TODO: configure later
 
 # set -g @plugin 'tmux-plugins/tmux-resurrect'
 # set -g @plugin 'tmux-plugins/tmux-continuum'
 
 ### NAVIGATION KEYBINDINGS
+#
+### Note: m:n:e:i are h:j:k:l on colemak-dh
 
 # focus panes
 bind -n M-m select-pane -L
@@ -88,43 +98,42 @@ bind Right resize-pane -R 5
 bind Up resize-pane -U 5
 bind Down resize-pane -D 5
 
-bind v copy-mode
+# Focus windows
 bind u next-window
 bind l previous-window
 
+# Swap active pane with direction
 bind -n M-j swap-pane -t left
 bind -n M-l swap-pane -D
 bind -n M-u swap-pane -U
 bind -n M-y swap-pane -t right
 
 # m to mark a pane, M to "swap" it with current pane
+# Note: this does not "unmark" the marked pane!
 bind M swap-pane
 
+# Unbind these resizing defaults
+# as they conflict with Neovim
 unbind -n M-Left
 unbind -n M-Right
 unbind -n M-Up
 unbind -n M-Down
 
-# Theme Settings
-set -g @minimal-tmux-use-arrow false
-set -g @minimal-tmux-status "top"
-set -g @minimal-tmux-right true
-set -g @minimal-tmux-justify "centre"
-set -g @minimal-tmux-bg "#933737"
-set -g @minimal-tmux-fg "#000000"
-bind-key t set-option status
-
+# Toggle status bar
+bind-key b set-option status
 
+# Enable vi keys in copy mode
 set-window-option -g mode-keys vi
 
+# Copy mode
+# TODO: binding to cancel copy mode without selecting
+bind v copy-mode
 bind-key -T copy-mode-vi v send-keys -X begin-selection
 bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
 bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
 
-bind-key b set-option status
-
 # Do not preserve the current working directory for new windows
 bind c new-window -c ""
 
-
+# WARN: This line must come last!
 run '/usr/share/tmux-plugin-manager/tpm'