diff --git a/.tmux.conf b/.tmux.conf
index 426d673..db3e870 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -4,6 +4,9 @@ bind r source ~/.tmux.conf
 # Remove ESC moving panes, etc
 set -s escape-time 0
 
+# ------ Controls ------
+# ---- Pane Controls ----
+
 # Vim binding for pane switching (needs to take multiple inputs tho)
 bind h select-pane -L
 bind j select-pane -D
@@ -22,36 +25,28 @@ bind -n C-S-j resize-pane -D 2
 bind -n C-S-k resize-pane -U 2
 bind -n C-S-l resize-pane -R 2
 
-# Zoom into the current pane
-bind-key z resize-pane -Z
-bind -n C-z resize-pane -Z
-
-# Enable mouse control (clickable windows, panes, resizable panes)
-set -g mouse on
-
-# Disable auto renames
-set-option -g allow-rename off
-
-# Display
-set -g base-index 1			# Start window numbering at 1
-setw -g pane-base-index 1	# Start pane numbering at 1
-
-set -g renumber-windows on	# Renumber windows on close
-
-# Pane Controls
+# Switch Panes
 bind -r > swap-pane -D # Next pane
 bind -r < swap-pane -U # Prev Pan
 bind -n M-> swap-pane -D # Next pane
 bind -n M-< swap-pane -U # Next pane
 
-# Window Controls
+# Splits
+bind -n M-/ split-window -h # Split panes horizontal
+bind -n M-? split-window -v # Split panes vertically
+
+# Zoom into the current pane
+bind-key z resize-pane -Z
+bind -n C-z resize-pane -Z
+
+# ---- Window Controls ----
 #unbind n
 #unbind p
 bind -r C-h previous-window # select previous window
 bind -r C-l next-window     # select next window
 bind Tab last-window        # move to last active window
 
-# Sessions
+# ---- Session Controls ----
 bind -n C-s new-session 
 
 # Buffers
@@ -59,24 +54,31 @@ bind b list-buffers  # list paste buffers
 bind p paste-buffer  # paste from the top paste buffer
 bind P choose-buffer
 
-# Split keys
-#bind / split-window -h # Split panes horizontal
-#bind \ split-window -v # Split panes vertically
+# Popup Session
+#bind -n M-g display-popup -E "tmux new-session -A -s scratch"
+
+# ------ General ------
+# Enable mouse control (clickable windows, panes, resizable panes)
+#set -g mouse on
+
+# Disable auto renames
+set-option -g allow-rename off
+setw -g automatic-rename off
+
+# Display
+set -g base-index 1			# Start window numbering at 1
+setw -g pane-base-index 1	# Start pane numbering at 1
+
+set -g renumber-windows on	# Renumber windows on close
 
-# ?
 set -g status-keys vi
 set -g mode-keys vi
 
-# Popup Session
-#bind -n M-g display-popup -E "tmux new-session -A -s scratch"
-
-# THEME
+# ------ Theme ------
 # https://gist.github.com/spicycode/1229612
 set -g status-bg black
 set -g status-fg white
-#set -g window-status-current-bg white
-#set -g window-status-current-fg black
-#set -g window-status-current-attr bold
+set-window-option -g window-status-current-style fg=black,bg=white
 set -g status-interval 60
 set -g status-left-length 30
 
@@ -90,7 +92,7 @@ set -g bell-action none
 
 # statusbar
 set -g status-position bottom
-#set -g status-justify center
+set -g status-justify centre
 #set -g status-right-length 50
 #set -g status-left-length 20