-#Integrate Mouse Scrolling
-# setw -g mode-mouse on
-# set-option -g mouse-select-pane on
-
-#Increase the scrollback
+# Increase the scrollback
set -g history-limit 5000
-#Screen-like prefix.
+# Screen-like prefix.
set -g prefix C-a
bind-key C-a last-window
-#Better bindings for window split
+# Better bindings for window split
unbind % # Remove default binding since we’re replacing
bind | split-window -h
bind - split-window -v
-#Customize the status bars.
-# set -g status-bg cyan
-# set -g status-fg white
-# set -g status-left-length 24
-# set -g status-left '#[fg=black]#[bg=white]#H-#S'
-# set-window-option -g window-status-current-bg red
-# set -g status-right '#[fg=black]#[bg=white]#(uptime)'
-# set -g status-right-length 70
-
-# Powerline
-source ~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf
-
-#Set Activity monitoring.
+# Customize the status bars.
+set-option -g status-style bg=default
+set -g status-fg colour232
+set -g status-left-length 24
+set -g status-left '#[fg=green]#[fg=colour232, bg=green]#S#[fg=green, bg=default] #[default]'
+set -g pane-border-format '#[bold]#[reverse]#{pane_current_command}#[default]'
+setw -g window-status-current-format '#[fg=magenta]#[fg=colour232, bg=magenta]#{window_index}:#{window_name}#[fg=magenta, bg=default]#[default]'
+setw -g window-status-format '#[fg=black]#[fg=colour232, bg=black]#{window_index}:#{window_name}#[fg=black, bg=default]#[default]'
+# set-window-option -g window-status-current-style bg=magenta,fg=color232
+# set-window-option -g window-status-style fg=colour232
+set -g status-right '#[fg=green]#[fg=colour232, bg=green]#(bash ~/.dotfiles/tmux-segments/short-uptime)#[fg=green, bg=default] '
+set -g status-right-length 70
+
+# Better powerline highlighting.
+set-window-option -g window-status-activity-style bold,underscore
+
+# Set Activity monitoring.
setw -g monitor-activity on
set -g visual-activity on
# Vi keys in copy mode.
setw -g mode-keys vi
+bind -r k run-shell 'tmux select-pane -U'
+bind -r j run-shell 'tmux select-pane -D'
+bind -r h run-shell 'tmux select-pane -L'
+bind -r l run-shell 'tmux select-pane -R'
+
+# Mouse Mode
+set -g mouse on
# Set color mode.
-set -g default-terminal "screen-256color"
+set -g default-terminal "xterm-256color"
+set-option -ga terminal-overrides ",xterm-256color:Tc"
+
+# Pane Style
+set -g pane-border-status top
+set -g pane-border-format '#[bold]#[reverse]#{pane_current_command}#[default]'
+
+# Terminal Title
+set -g set-titles on
+set -g set-titles-string ' #{session_name}'