diff --git a/catppuccin.tmux b/catppuccin.tmux
index d34b0fd..e7fa0ed 100755
--- a/catppuccin.tmux
+++ b/catppuccin.tmux
@@ -58,7 +58,7 @@ 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[suface0]}] #{?#{==:#{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[text]},bg=${THEME[suface2]}] #{?#{==:#{pane_current_command},ssh},󰣀 ,}#[fg=${THEME[green]},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[text]}] #{?#{==:#{pane_current_command},ssh},󰣀 ,}${RESET}$window_number#W#[nobold,dim]#{?window_zoomed_flag, $zoom_number, $custom_pane}#[fg=${THEME[yellow]}]#{?window_last_flag, , }"
 
diff --git a/src/datetime-widget.sh b/src/datetime-widget.sh
index 455baef..564182b 100755
--- a/src/datetime-widget.sh
+++ b/src/datetime-widget.sh
@@ -30,4 +30,4 @@ else
   time_string="%H:%M "
 fi
 
-echo "$RESET#[fg=${THEME[yellow]},bg=${THEME[base]}]$date_string $separator$time_string"
+echo "$RESET#[fg=${THEME[lavender]},bg=${THEME[base]}]$date_string $separator$time_string"
diff --git a/src/themes.sh b/src/themes.sh
index 4c8f700..1af45cd 100644
--- a/src/themes.sh
+++ b/src/themes.sh
@@ -90,6 +90,7 @@ case $SELECTED_THEME in
     ["lavender"]="#b4befe"
     ["red"]="#f38ba8"
     ["subtext1"]="#11111b"
+    ["surface2"]="#585b70"
     ["surface0"]="#313244"
     ["yellow"]="#f9e2af"