diff --git a/.tmux.conf b/.tmux.conf
index 73ac60d..ad68c13 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -9,40 +9,14 @@ set -g history-limit 10000
 set -g prefix C-a
 unbind C-b
 
-## use send-prefix to pass C-a through to application
-bind C-a send-prefix
-
-## shorten command delay
-set -sg escape-time 1
-
-## set window and pane index to 1 (0 by default)
-#set-option -g base-index 1
-#setw -g pane-base-index 1
-
 ## reload ~/.tmux.conf using PREFIX r
 bind r source-file ~/.tmux.conf \; display "Reloaded!"
 
-## use PREFIX | to split window horizontally and PREFIX - to split vertically
-bind | split-window -h
-bind - split-window -v
-
-## Make the current window the first window
-bind T swap-window -t 1
-
-## Titles
-set-option -g set-titles on
-set-option -g set-titles-string '#H:#S.#I.#P #W #T' # window number,program name, active(or not)
-
-## Tab through active windows
-bind Tab next-window
-
 ## map Vi movement keys as pane movement keys
 bind h select-pane -L
 bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
-set-option -g display-panes-active-colour colour2
-set-option -g display-panes-colour colour1
 
 ## resize panes using PREFIX H, J, K, L
 bind H resize-pane -L 5
@@ -50,19 +24,16 @@ bind J resize-pane -D 5
 bind K resize-pane -U 5
 bind L resize-pane -R 5
 
-## ----------------------
-## set some pretty colors
-## ----------------------
-## set pane colors - hilight the active pane
-set -g pane-border-style bg=colour0,fg=colour8
-set -g pane-active-border-style bg=colour36,fg=colour2
+## PREFIX | to split horizontally
+## PREFIX - to split vertically
+bind | split-window -h
+bind - split-window -v
 
-## colorize messages in the command line
-set-option -g message-style bg=colour0,fg=colour9
+## shorten command delay
+set -sg escape-time 1
 
-#set inactive/active window styles
-set -g window-style fg=colour0,bg=colour8
-set -g window-active-style fg=colour36,bg=colour2
+## Tab through active windows
+bind Tab next-window
 
 ## ----------------------
 ## Status Bar
@@ -71,25 +42,59 @@ set-option -g status on                # turn the status bar on
 set -g status-interval 5               # set update frequencey (default 15 seconds)
 set -g status-justify centre           # center window list for clarity
 
+## ----------------------
+## set some pretty colors
+## ----------------------
+## set pane colors - hilight the active pane
+set -g pane-border-style bg=colour0,fg=colour8
+set -g pane-active-border-style bg=colour0,fg=colour2
+
+## colorize messages in the command line
+set-option -g message-style bg=colour0,fg=colour13
+
+## set window list colors
+set-window-option -g window-status-style fg=colour8,bg=colour0
+set-window-option -g window-status-current-style fg=colour2,bg=colour0,bright
+
+## Titles
+set-option -g set-titles on
+set-option -g set-titles-string '#H:#S.#I.#P #W #T' # window number,program name, active(or not)
+
+#set inactive/active window styles
+# set -g window-style fg=colour0,bg=colour0
+# set -g window-active-style fg=colour7,bg=colour0
+# -- or --
+# These make tmux transparent again
+set -g window-style bg=default
+set -g window-active-style bg=default
+
+## Status Bar: color
+set-option -g status-style bg=colour0,fg=colour8,bright
+
+## Status Bar: Left - hostname
+set -g status-left-length 70
+set -g status-left "#h"
+
+## Status Bar: Right - Session name, Window & Pane, Date & Time
+set -g status-right-length 60
+set -g status-right "S:#S W:#I P:#P | %Y-%m-%d %H:%M"
+
+# set window and pane index to 1 (0 by default)
+set-option -g base-index 1
+setw -g pane-base-index 1
+
 ## visual notification of activity in other windows
 setw -g monitor-activity on
 set -g visual-activity on
 
-## set color for status bar
-set-option -g status-style bg=colour0,fg=colour7,bright 
+# ----------------------------------
 
-## set window list colors
-set-window-option -g window-status-style fg=colour8,bg=colour0,bright
-set-window-option -g window-status-current-style fg=colour36,bg=colour0,bright
-
-## show host name and IP address on left side of status bar
-set -g status-left-length 70
-set -g status-left "#[fg=colour7]#h"
-
-## show session name, window & pane number, date and time on right side of status bar
-set -g status-right-length 60
-set -g status-right "#[fg=colour7]#S w#I:p#P  |  %b %d  |  %H:%M"
-
-# These make tmux transparent again
-set -g "window-style" "bg=default"
-set -g "window-active-style" "bg=default"
+# ## use send-prefix to pass C-a through to application
+# #bind C-a send-prefix
+#
+# ## Make the current window the first window
+# bind T swap-window -t 1
+#
+# set-option -g display-panes-active-colour colour2
+# set-option -g display-panes-colour colour1
+#