diff --git a/catppuccin.tmux b/catppuccin.tmux
index 5e4dfde..d34b0fd 100755
--- a/catppuccin.tmux
+++ b/catppuccin.tmux
@@ -58,9 +58,9 @@ tmux set -g status-left "#[fg=${THEME[base]},bg=${THEME[lavender]},bold] #{?clie
 
 #+--- Windows ---+
 # Focus
-tmux set -g window-status-current-format "$RESET#[fg=${THEME[green]},bg=${THEME[overlay2]}] #{?#{==:#{pane_current_command},ssh},󰣀 ,}#[fg=${THEME[text]},bold,nodim]$window_number#W#[nobold]#{?window_zoomed_flag, $zoom_number, $custom_pane}#{?window_last_flag, , }"
+tmux set -g window-status-current-format "$RESET#[fg=${THEME[green]},bg=${THEME[suface0]}] #{?#{==:#{pane_current_command},ssh},󰣀 ,}#[fg=${THEME[text]},bold,nodim]$window_number#W#[nobold]#{?window_zoomed_flag, $zoom_number, $custom_pane}#{?window_last_flag, , }"
 # Unfocused
-tmux set -g window-status-format "$RESET#[fg=${THEME[subtext1]}] #{?#{==:#{pane_current_command},ssh},󰣀 ,}${RESET}$window_number#W#[nobold,dim]#{?window_zoomed_flag, $zoom_number, $custom_pane}#[fg=${THEME[yellow]}]#{?window_last_flag, , }"
+tmux set -g window-status-format "$RESET#[fg=${THEME[text]}] #{?#{==:#{pane_current_command},ssh},󰣀 ,}${RESET}$window_number#W#[nobold,dim]#{?window_zoomed_flag, $zoom_number, $custom_pane}#[fg=${THEME[yellow]}]#{?window_last_flag, , }"
 
 #+--- Bars RIGHT ---+
 tmux set -g status-right "$battery_status$current_path$cmus_status$netspeed$git_status$wb_git_status$date_and_time"
diff --git a/src/themes.sh b/src/themes.sh
index eadbe8f..4c8f700 100644
--- a/src/themes.sh
+++ b/src/themes.sh
@@ -90,6 +90,7 @@ case $SELECTED_THEME in
     ["lavender"]="#b4befe"
     ["red"]="#f38ba8"
     ["subtext1"]="#11111b"
+    ["surface0"]="#313244"
     ["yellow"]="#f9e2af"
 
     ["bblack"]="#313244"