diff --git a/.tmux.conf b/.tmux.conf
index ac5a171..5f85793 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,43 +1,21 @@
-######################
-### DESIGN CHANGES ###
-######################
+##########################################
+### Defaults
+##########################################
 
-# panes
-set -g pane-border-fg black
-set -g pane-active-border-fg brightred
+# terminal mode
+set -g default-terminal "screen-256color"
 
-## Status bar design
-# status line
-set -g status-utf8 on
-set -g status-justify left
-set -g status-bg default
-set -g status-fg colour12
-set -g status-interval 2
+# don't detach tmux when killing a session
+set-option -g detach-on-destroy off
 
-# messaging
-set -g message-fg black
-set -g message-bg yellow
-set -g message-command-fg blue
-set -g message-command-bg black
+# Scroll History
+#set -g history-limit 30000
 
-#window mode
-setw -g mode-bg colour6
-setw -g mode-fg colour0
+# Set ability to capture on start and restore on exit window data when running an application
+setw -g alternate-screen on
 
-# window status
-setw -g window-status-format " #F#I:#W#F "
-setw -g window-status-current-format " #F#I:#W#F "
-setw -g window-status-format "#[fg=magenta]#[bg=black] #I #[bg=cyan]#[fg=colour8] #W "
-setw -g window-status-current-format "#[bg=brightmagenta]#[fg=colour8] #I #[fg=colour8]#[bg=colour14] #W "
-setw -g window-status-current-bg colour0
-setw -g window-status-current-fg colour11
-setw -g window-status-current-attr dim
-setw -g window-status-bg green
-setw -g window-status-fg black
-setw -g window-status-attr reverse
-
-# Info on left (I don't have a session display for now)
-set -g status-left ''
+# Lower escape timing from 500ms to 50ms for quicker response to scroll-buffer access.
+set -s escape-time 50
 
 # loud or quiet?
 set-option -g visual-activity off
@@ -46,25 +24,27 @@ set-option -g visual-silence off
 set-window-option -g monitor-activity off
 set-option -g bell-action none
 
-set -g default-terminal "screen-256color"
+# mouse
+set -g mode-mouse on
+set -g mouse-select-pane on
+set -g mouse-resize-pane
+set -g mouse-select-window on
 
-# The modes {
-setw -g clock-mode-colour colour135
-setw -g mode-attr bold
-setw -g mode-fg colour196
-setw -g mode-bg colour238
 
-# }
-# The panes {
+##########################################
+### Styling
+##########################################
 
+# panes
 set -g pane-border-bg colour235
 set -g pane-border-fg colour238
 set -g pane-active-border-bg colour236
 set -g pane-active-border-fg colour51
 
-# }
-# The statusbar {
-
+# status line
+set -g status-utf8 on
+set -g status-justify left
+set -g status-interval 2
 set -g status-position bottom
 set -g status-bg colour234
 set -g status-fg colour137
@@ -74,6 +54,20 @@ set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=c
 set -g status-right-length 50
 set -g status-left-length 20
 
+# messaging
+set -g message-attr bold
+set -g message-fg colour232
+set -g message-bg colour166
+set -g message-command-fg blue
+set -g message-command-bg black
+
+#window mode
+setw -g clock-mode-colour colour135
+setw -g mode-attr bold
+setw -g mode-fg colour196
+setw -g mode-bg colour238
+
+# window status
 setw -g window-status-current-fg colour81
 setw -g window-status-current-bg colour238
 setw -g window-status-current-attr bold
@@ -88,36 +82,13 @@ setw -g window-status-bell-attr bold
 setw -g window-status-bell-fg colour255
 setw -g window-status-bell-bg colour1
 
-# }
-# The messages {
+# Info on left (I don't have a session display for now)
+set -g status-left ''
 
-set -g message-attr bold
-set -g message-fg colour232
-set -g message-bg colour166
 
-# }
-
-####################################################
-### Settings MF
-####################################################
-
-set -g default-terminal "xterm"
-
-set -g mode-mouse on
-set -g mouse-select-pane on
-set -g mouse-resize-pane
-set -g mouse-select-window on
-
-set-option -g detach-on-destroy off
-
-# Scroll History
-#set -g history-limit 30000
-
-# Set ability to capture on start and restore on exit window data when running an application
-setw -g alternate-screen on
-
-# Lower escape timing from 500ms to 50ms for quicker response to scroll-buffer access.
-set -s escape-time 50
+##########################################
+### some tmux tweaks 
+##########################################
 
 # Use vim keybindings in copy mode
 setw -g mode-keys vi
@@ -130,20 +101,22 @@ bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
 unbind -t vi-copy Enter
 bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
 
+
 # split panes using | and -
 bind | split-window -h
 bind - split-window -v
 unbind '"'
 unbind %
 
+
 # Start windows and panes at 1, not 0
 set -g base-index 1
 setw -g pane-base-index 1
 
+
 # reload config file (change file location to your the tmux.conf you want to use)
 bind r source-file ~/.tmux.conf
 
-#set-option -g status-right '#[fg=white,nobright][ #[fg=black,bright]#(uptime | rev | cut -d":" -f1 | rev | sed s/,//g )#[fg=white,nobright] ]'
 
 # Setup 'x' zoom into a panes (maximize) an save/restore other panes in the current window
 bind x run ". ~/.tmux/zoom"