diff --git a/dotfiles/common/.tmux.conf b/dotfiles/common/.tmux.conf
index f166554..e917d3d 100644
--- a/dotfiles/common/.tmux.conf
+++ b/dotfiles/common/.tmux.conf
@@ -29,7 +29,7 @@ bind S command-prompt -p "New Session:" "new-session -A -s '%%'"
 bind K confirm kill-session
 set-option -g detach-on-destroy off
 
-#=== LAYOUT ===#
+#=== LAYOUT ====#
 set -g renumber-window on
 set -g base-index 1
 setw -g pane-base-index 1
@@ -39,15 +39,14 @@ bind c new-window -c '#{pane_current_path}'
 set -g mouse on
 
 # Fix Tmux for colors
-set -g default-terminal "tmux-256color"
-set -ag terminal-features ',alacritty:RGB,foot:RGB,xterm-256color:RGB,gnome*:RGB'
+set -g default-terminal "screen-256color"
+set -ag terminal-features ',screen-256color:RGB,tmux*:RGB,alacritty:RGB,foot:RGB,xterm-256color:RGB,gnome*:RGB'
 set -g allow-passthrough on
 set -ga update-environment TERM
 set -ga update-environment TERM_PROGRAM
 
 #=== PLUGINS ===#
 set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'sei40kr/tmux-project'
 set -g @plugin 'Alkindi42/tmux-bitwarden'
@@ -55,52 +54,59 @@ set-option -g @plugin 'b0o/tmux-autoreload'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
 
-# Configure Catppuccin
-set -g @catppuccin_flavor "mocha"
-set -g @catppuccin_status_background "none"
-set -g @catppuccin_window_status_style "none"
-set -g @catppuccin_pane_status_enabled "off"
-set -g @catppuccin_pane_border_status "off"
+#=== THEME: Yaru Blue Dark ===#
+# palette
+set -g @yaru_bg "#2b2b2e"
+set -g @yaru_bg_light "#3b3b3e"
+set -g @yaru_fg "#e0e0e0"
+set -g @yaru_fg_dim "#9a9a9a"
+set -g @yaru_blue "#4a90d9"
+set -g @yaru_blue_b "#6daeea"
+set -g @yaru_orange "#e95420"
+set -g @yaru_sep "#4a4a52"
+set -g @yaru_red "#c7162b"
+set -g @yaru_green "#4caf50"
+
+# status bar
+set -g status-position top
+set -g status-style "bg=#{@yaru_bg}"
+set -g status-left-length 120
+set -g status-right-length 120
 
-# status left look and feel
-set -g status-left-length 100
 set -g status-left ""
-set -ga status-left "#{?client_prefix,#{#[bg=#{@thm_red},fg=#{@thm_bg},bold]  #S },#{#[bg=#{@thm_bg},fg=#{@thm_green}]  #S }}"
-set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│"
-set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_maroon}]  #{pane_current_command} "
-set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│"
-set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_blue}]  #{=/-32/...:#{s|$USER|~|:#{b:pane_current_path}}} "
-set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]#{?window_zoomed_flag,│,}"
-set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_yellow}]#{?window_zoomed_flag,  zoom ,}"
+set -ga status-left "#[bg=#{@yaru_bg},fg=#{@yaru_blue},bold]  #S "
+set -ga status-left "#[bg=#{@yaru_bg},fg=#{@yaru_sep}]│"
+set -ga status-left "#[bg=#{@yaru_bg},fg=#{@yaru_fg_dim}]  #{pane_current_command} "
+set -ga status-left "#[bg=#{@yaru_bg},fg=#{@yaru_sep}]│"
+set -ga status-left "#[bg=#{@yaru_bg},fg=#{@yaru_blue_b}]  #{=/-40/...:#{s|$USER|~|:#{b:pane_current_path}}} "
+set -ga status-left "#[bg=#{@yaru_bg},fg=#{@yaru_sep}]#{?window_zoomed_flag,│,}"
+set -ga status-left "#[bg=#{@yaru_bg},fg=#{@yaru_orange}]#{?window_zoomed_flag,  zoom ,}"
 
-# status right look and feel
-set -g status-right-length 100
 set -g status-right ""
 set -g status-right '#(gitmux "#{pane_current_path}") '
-set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none]│"
-set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_blue}] #H"
+set -ga status-right "#[bg=#{@yaru_bg},fg=#{@yaru_sep}]│"
+set -ga status-right "#[bg=#{@yaru_bg},fg=#{@yaru_blue_b}]  #H"
 
-set -g status-position top
-set -g status-style "bg=#{@thm_bg}"
-
-# pane border look and feel
-setw -g pane-border-status top
-setw -g pane-border-format ""
-setw -g pane-active-border-style "bg=#{@thm_bg},fg=#{@thm_overlay_0}"
-setw -g pane-border-style "bg=#{@thm_bg},fg=#{@thm_surface_0}"
+# pane borders
+setw -g pane-border-status off
+setw -g pane-active-border-style "fg=#{@yaru_blue}"
+setw -g pane-border-style "fg=#{@yaru_sep}"
 setw -g pane-border-lines single
 
-# window look and feel
-set -wg automatic-rename on
-set -g automatic-rename-format "Window"
-set -g window-status-format " #I#{?#{!=:#{window_name},Window},: #W,} "
-set -g window-status-style "bg=#{@thm_bg},fg=#{@thm_rosewater}"
-set -g window-status-last-style "bg=#{@thm_bg},fg=#{@thm_peach}"
-set -g window-status-activity-style "bg=#{@thm_red},fg=#{@thm_bg}"
-set -g window-status-bell-style "bg=#{@thm_red},fg=#{@thm_bg},bold"
-set -gF window-status-separator "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}]│"
-set -g window-status-current-format " #I#{?#{!=:#{window_name},Window},: #W,} "
-set -g window-status-current-style "bg=#{@thm_peach},fg=#{@thm_bg},bold"
+# message and mode
+set -g message-style "bg=#{@yaru_blue},fg=#{@yaru_bg},bold"
+set -g message-command-style "bg=#{@yaru_blue},fg=#{@yaru_bg},bold"
+set -g mode-style "bg=#{@yaru_orange},fg=#{@yaru_bg},bold"
+
+# window status
+set -g window-status-format " #I:#{?#{!=:#{window_name},Window},#W,} "
+set -g window-status-style "bg=#{@yaru_bg},fg=#{@yaru_fg_dim}"
+set -g window-status-last-style "bg=#{@yaru_bg},fg=#{@yaru_fg}"
+set -g window-status-activity-style "bg=#{@yaru_bg},fg=#{@yaru_orange}"
+set -g window-status-bell-style "bg=#{@yaru_bg},fg=#{@yaru_red},bold"
+set -gF window-status-separator "#[bg=#{@yaru_bg},fg=#{@yaru_sep}]│"
+set -g window-status-current-format " #I:#{?#{!=:#{window_name},Window},#W,} "
+set -g window-status-current-style "bg=#{@yaru_blue},fg=#{@yaru_bg},bold"
 
 # Continuum options
 set -g @continuum-restore 'on'
@@ -115,4 +121,3 @@ set -g @bw-key 'T'
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'
-