diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 98f1357..00f4c12 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -9,9 +9,8 @@ bind C-o send-prefix
 set -g status-interval 0
 
 set-option -g automatic-rename on
-set-option -g automatic-rename-format '#I:#W [#{pane_index}/#{window_panes}]'
 set-option -g set-titles on
-set-option -g set-titles-string "#T / #W"
+set-option -g set-titles-string "[#S] #I:#W [#{pane_index}/#{window_panes}]"
 
 # Vim style pane selection
 bind h select-pane -L
@@ -71,8 +70,8 @@ set -g @plugin 'tinted-theming/base16-tmux'
 
 set -g @colors-base16 'ocean'
 
-set -g window-status-current-format "#I:#W [#{pane_index}/#{window_panes}]"
-set -g window-status-format "#I:#W [#{pane_index}/#{window_panes}]"
+set -g window-status-current-format "[#S] #I:#W [#{pane_index}/#{window_panes}]"
+set -g window-status-format "[#S] #I:#W [#{pane_index}/#{window_panes}]"
 run '~/.tmux/plugins/tpm/tpm'
 
 # set vi-mode