diff --git a/src/nord-status-content.conf b/src/nord-status-content.conf
index 11980e1..90bc123 100644
--- a/src/nord-status-content.conf
+++ b/src/nord-status-content.conf
@@ -17,6 +17,14 @@ set -g status-left "#[fg=black,bg=blue,bold] #S #[fg=blue,bg=black,nobold,noital
 set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] ${NORD_TMUX_STATUS_DATE_FORMAT} #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] ${NORD_TMUX_STATUS_TIME_FORMAT} #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H "
 
 #+--- Windows ---+
-set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]"
-set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]"
+set -ogq @nord_window_status_prefix "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]"
+set -ogq @nord_window_status_text "#W #F"
+set -ogq @nord_window_status_sufix "#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]"
+
+set -ogq @nord_window_status_current_prefix "#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]"
+set -ogq @nord_window_status_current_text "#W #F"
+set -ogq @nord_window_status_current_sufix "#[fg=cyan,bg=black,nobold,noitalics,nounderscore]"
+
+set -g window-status-format "#{E:@nord_window_status_prefix}#{E:@nord_window_status_text}#{@nord_window_status_sufix}"
+set -g window-status-current-format "#{E:@nord_window_status_current_prefix}#{E:@nord_window_status_current_text}#{@nord_window_status_current_sufix}"
 set -g window-status-separator ""