diff --git a/.gitmodules b/.gitmodules
index 2fa59ed..0a479c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,3 +26,7 @@
 	path = dotfiles/zprezto
 	url = https://github.com/sorin-ionescu/prezto.git
 	fetchRecurseSubmodules = true
+[submodule "dotfiles/tmux/tmux-logging"]
+	path = dotfiles/tmux/tmux-logging
+	url = https://github.com/tmux-plugins/tmux-logging.git
+	fetchRecurseSubmodules = true
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index d1682b7..6e68a86 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -18,6 +18,10 @@ set -g pane-base-index 1
 set -g set-titles on
 set -g set-titles-string '#h:#S:#I.#P #W'
 
+# Set keybindings
+set -g mode-keys vi
+set -g status-keys vi
+
 # Set a 256color $TERM variable so programs inside tmux know they can use 256
 # colors
 set -g default-terminal screen-256color
@@ -61,3 +65,6 @@ bind M \
 # tmux X clipboard integration
 bind C-c run "tmux show-buffer | xsel -i -b"
 bind C-v run "tmux set-buffer -- \"$(xsel -o -b)\"; tmux paste-buffer"
+
+# Enable logging module, if available
+run-shell "~/.tmux/tmux-logging/logging.tmux || true"
diff --git a/dotfiles/tmux/tmux-logging b/dotfiles/tmux/tmux-logging
new file mode 160000
index 0000000..b085ad4
--- /dev/null
+++ b/dotfiles/tmux/tmux-logging
@@ -0,0 +1 @@
+Subproject commit b085ad423b5d59a2c8b8d71772352e7028b8e1d0