diff --git a/home/.tmux.conf b/home/.tmux.conf
index d37d6c2..44762d3 100644
--- a/home/.tmux.conf
+++ b/home/.tmux.conf
@@ -14,6 +14,8 @@ set-option -s escape-time 0
 # Enable proper mouse support:
 # http://www.hamvocke.com/blog/a-guide-to-customizing-your-tmux-conf/
 set-option -g mouse on
+bind-key m set-option -g mouse on
+bind-key M set-option -g mouse off
 
 # The following line prevents a weird OS X problem that otherwise
 # keeps the "open" command from working (and has several other
@@ -143,13 +145,13 @@ set-option -g status-left '#{?client_prefix,#[fg=colour254]#[bg=colour31],#[fg=c
 set-option -g status-left-length 90
 
 # Format to display on the right-hand side of the status bar.
-set-option -g status-right ''
+set-option -g status-right '#{?mouse,#[fg=colour254]#[bg=colour31],#[fg=colour244,bg=colour234]} Mouse #[fg=colour254,bg=colour234] #H'
 
 # Format to display for the current window.
-set-option -g window-status-current-format "#[fg=colour117,bg=colour31] #{window_index}#{window_flags} #[fg=colour231,bold]#{window_name} #[fg=colour31,bg=colour234,nobold] "
+set-option -g window-status-current-format '#[fg=colour117,bg=colour31] #{window_index}#{window_flags} #[fg=colour231,bold]#(tmux display-message -p "#{pane_current_path}" | sed "s#$HOME#~#g") #{?#{m:*#{b:SHELL}*, #{pane_current_command}},,| #{pane_current_command} }#[fg=colour31,bg=colour234,nobold]'
 
 # Format to display for other windows.
-set-option -g window-status-format "#[fg=colour244,bg=colour234]#{window_index}#{window_flags} #[fg=colour249]#{window_name} "
+set-option -g window-status-format '#[fg=colour244,bg=colour234]#{window_index}#{window_flags} #[fg=colour249]#(tmux display-message -p "#{pane_current_path}" | sed "s#$HOME#~#g") #{?#{m:*#{b:SHELL}*, #{pane_current_command}},,| #{pane_current_command} }'
 
 # Background color for parts of the status bar not specified by the above
 # formats. For instance, the empty space to the right, and the single
@@ -218,4 +220,4 @@ set-option -g history-limit 10000
 ################################################################################
 #### Local overrides
 
-if-shell "[[ -f ~/.tmux.local.conf ]]" "source ~/.tmux.local.conf"
\ No newline at end of file
+if-shell "[[ -f ~/.tmux.local.conf ]]" "source ~/.tmux.local.conf"