diff --git a/tmux.conf b/tmux.conf
index 9704cb5..ae4c6f0 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -5,12 +5,15 @@ if "test -f $HOME/.tmux.conf.local" "source-file $HOME/.tmux.conf.local" \
 
 unbind C-b
 set -g prefix C-z
+
 bind C-z send-prefix
 bind C-c command-prompt "new-window '%%'"
 bind C-r source-file ~/.tmux.conf \; display-message "Reloaded config !"
 # new-session: -A: "behaves like attach-session if session-name already exists"
 #              -d: do not attach the created session
-bind C-s command-prompt -p "session name:" \
+bind C-s command-prompt -p "session name to switch to:" \
+    "new-session -Ad -s '%1'\; switch-client -t '%1'"
+bind C-o command-prompt -p "session name to switch to:" \
     "new-session -Ad -s '%1'\; switch-client -t '%1'"
 
 set -g base-index 1
@@ -25,8 +28,10 @@ setw -g mode-mouse off
 # try to set title of terminal tmux is running on
 # set -g set-titles off
 set -g display-panes-time 5000
-set -g window-status-current-format "#I|#W:#T#F"
-set -g window-status-format "#I|#W:#T#F"
+# <Index>|<Command>:<Title><Window flag>
+# Example: `1|emacs:.dotfiles*`
+set -g window-status-current-format "#I|#{pane_current_command}:#T#F"
+set -g window-status-format "#I|#{pane_current_command}:#T#F"
 # set window name automatically from command currently running
 set -g automatic-rename on