diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index edb6978..e78a01c 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -1,4 +1,7 @@
 # vi:syntax=tmux
+# Include current color theme
+source-file ~/.config/tmux/current-theme.conf
+
 # Reload the config with the "r" key
 bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."
 
@@ -15,26 +18,21 @@ set -g default-terminal "screen-256color"
 
 # Set titles to be informative
 set -g set-titles on
-set -g set-titles-string "tmux: [#H] [#S] [#W:#D #I:#P]"
-
-# Change pane colors
-set -g pane-border-style fg=colour237
-set -g pane-active-border-style fg=colour199
+set -g set-titles-string "[#H:#S] #W:#D-#I:#P (tmux)"
 
 # Tweak currently active window
-setw -g window-status-current-format " #F[#W] "
-# Tweak last active window style
+#setw -g window-status-current-format " #F[#W] "
 
 # Tweak display of window overview
-setw -g window-status-format " #F[#W][#I] "
+#setw -g window-status-format " #F[#W][#I] "
 
-# Tweak status line design
+# Status bar content
 set -g status-justify centre
-set -g status-left " [#H] [#S] "
+set -g status-left " [#{user}@#H:#S] "
 set -g status-left-length 100
 set -g status-right '[%Y-%m-%d %H:%M.%S]'
-# Refresh status bar every 2s
-set -g status-interval 2
+# Refresh status bar every second
+set -g status-interval 1
 
 # Set some helpful limits & modes
 set -g mouse off
@@ -44,8 +42,7 @@ set -g history-limit 500000
 setw -g aggressive-resize on
 
 # Retain cwd on new pane creation
-bind c new-window -c "#{pane_current_path}"
+#bind c new-window -c "#{pane_current_path}"
 
-source-file ~/.config/tmux/current-theme.conf
 
 #refresh-client