diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index a5a333a..f1937b9 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -8,11 +8,26 @@ bind-key v split-window -v
 bind - split-window -h
 bind _ split-window -v
 
+# Pane navigation
+bind j select-pane -D \; display-panes
+bind k select-pane -U \; display-panes
+bind l select-pane -R \; display-panes
+bind h select-pane -L \; display-panes
+bind C-l last-pane \; display-panes
+bind L last-pane \; display-panes
+
+# Window navigation
+bind Tab last-window
 bind Enter copy-mode
 bind Escape copy-mode
 
 bind r source-file ~/.tmux.conf; display " [tmux] ♦ Configuration reloaded from .tmux.conf"
 
+# Colors
+set -g display-panes-active-colour colour71
+set -g display-panes-colour colour244
+
+
 #set -g utf8 on
 #set-option -g status-utf8 on
 set -g default-terminal "xterm-256color"
@@ -27,6 +42,7 @@ set -g status-interval 1
 
 set -g window-status-format '#(~/.tmux/segment.sh start 235 237 round)#I#(~/.tmux/subsegment.sh end 234) #W #(~/.tmux/segment.sh end 237 235 round)'
 set -g window-status-current-format '#(~/.tmux/segment.sh start 235 71 round)#[fg=colour235]#I#(~/.tmux/subsegment.sh end 234)#[fg=colour235] #W #(~/.tmux/segment.sh end 71 235 round)'
+set -g window-status-current-format '#(~/.tmux/segment.sh start 235 71 round)#[fg=colour235]#I#(~/.tmux/subsegment.sh end 234)#[fg=colour235] #W #(~/.tmux/segment.sh end 71 235 round)'
 
 set -g status-right '#{?#(~/.tmux/mediaplaying.sh test),#(~/.tmux/segment.sh start 235 65)#[fg=colour235] ♫ #(~/.tmux/mediaplaying.sh) #(~/.tmux/segment.sh start 65 71),#(~/.tmux/segment.sh start 235 71)}#[fg=colour235] %H:%M:%S #(~/.tmux/subsegment.sh start) %d %b '
 set -g pane-active-border-style fg=colour76