diff --git a/tmux.conf b/tmux.conf
index 6b440ce..19922e9 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,19 +1,38 @@
-set-option -g prefix C-f
-set-option -g exit-unattached off
-set-option -g default-terminal "screen-256color"
-set-option -g set-titles off
-set-option -g visual-bell off
-set-option -g history-limit 10000
+# tmux config
+# Eryn Wells <eryn@erynwells.me>
 
-set-option -g mode-keys vi
+set -g default-terminal "screen-256color"
+set -g prefix C-f
+# Don't destroy sessions that have no clients attached.
+set -g exit-unattached off
+# Set terminal titles
+set -g set-titles on
+set -g set-titles-string "#T"
+# Ring bells for actions on any window in the session
+set -g bell-action any
+# Use audible bells
+set -g visual-bell off
+# Keep 10k lines of history for each window
+set -g history-limit 10000
+# Use vi keys for copy mode
+set -g mode-keys vi
+# Start window numbering at 1, not 0
+set -g base-index 1
+# Start pane numbering at 1, not 0
+set -g pane-base-index 1
+set -g repeat-time 0
 
-set-option -g base-index 1
-set-option -g pane-base-index 1
+set -g status-bg green
+set -g status-left ""
+set -g status-left-attr none
+set -g status-right "| #S "
+set -g status-right-attr none
 
-set-option -g status-bg green
+setw -g window-status-format " #I:#W(#P) "
+setw -g window-status-current-bg yellow
+setw -g window-status-current-format " #I:#W(#P) "
 
-set-window-option -g alternate-screen on
-
-set-window-option -g clock-mode-style 24
+setw -g alternate-screen on
+setw -g clock-mode-style 24
 
 bind-key C-a last-window