diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index acdf839..aebd209 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -52,9 +52,6 @@ set -g status on
 set-option -g status-interval 2
 bind Escape confirm-before "kill-server"
 
-# Automatically set window title
-setw -g automatic-rename off
-set-window-option -g automatic-rename off
 # set-option -g automatic-rename on
 # set-option -g automatic-rename-format '#{?#{m/r:^(/google/src)?/cloud/,#{pane_current_path}},#{s|^(/google/src)?/cloud/[^/]+/([^/]+).+$|\2|:pane_current_path},#{b:pane_current_path}}'
 
@@ -125,17 +122,53 @@ bind-key C-a set-option -g prefix C-a
 # No delay for escape key press
 set -sg escape-time 0
 
+set -g status-right '#{prefix_highlight} | %a %Y-%m-%d %H:%M'
+
+set -g @catppuccin_window_default_fill "number"
+# set -g @catppuccin_window_default_text "#W"
+set -g @catppuccin_window_default_text "#{pane_current_path}"
+
+set -g @catppuccin_window_current_fill "number"
+# set -g @catppuccin_window_current_text "#W"
+set -g @catppuccin_window_current_text '#{?#{m/r:^(/google/src)?/cloud/,#{pane_current_path}},#{s|^(/google/src)?/cloud/[^/]+/([^/]+).+$|\2|:pane_current_path},#{b:pane_current_path}}'
+
+set -g @catppuccin_pane_status_enabled "yes"
+set -g @catppuccin_pane_border_status "top"
+set -g @catppuccin_pane_left_separator ""
+set -g @catppuccin_pane_right_separator ""
+set -g @catppuccin_pane_middle_separator "█ "
+set -g @catppuccin_pane_number_position "left"
+set -g @catppuccin_pane_default_fill "number"
+
+set -g @catppuccin_status_modules_right "host cpu weather date_time"
+set -g @catppuccin_status_left_separator  ""
+set -g @catppuccin_status_right_separator " "
+set -g @catppuccin_status_right_separator_inverse "yes"
+set -g @catppuccin_status_fill "all"
+set -g @catppuccin_status_connect_separator "no"
+set -g @catppuccin_window_status_icon_enable "yes"
+
+set -g @catppuccin_icon_window_last "󰖰"
+set -g @catppuccin_icon_window_current "󰖯"
+set -g @catppuccin_icon_window_zoom "󰁌"
+set -g @catppuccin_icon_window_mark "󰃀"
+set -g @catppuccin_icon_window_silent "󰂛"
+set -g @catppuccin_icon_window_activity "󰖲"
+set -g @catppuccin_icon_window_bell "󰂞"
+
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'christoomey/vim-tmux-navigator'
 set -g @plugin 'tmux-plugins/tmux-cpu'
+set -g @plugin 'xamut/tmux-weather'
 set -g @plugin 'tmux-plugins/tmux-battery'
 set -g @plugin 'tmux-plugins/tmux-cowboy' # Kill process in pane w/ prefix+*
 set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
+set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
 
 set -g @continuum-restore 'on'
 set -g @resurrect-dir '$HOME/.tmux/resurrect'
diff --git a/tmux/.tmux/osiris-theme.conf b/tmux/.tmux/osiris-theme.conf
deleted file mode 100644
index 47e9427..0000000
--- a/tmux/.tmux/osiris-theme.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-######################
-### DESIGN CHANGES ###
-######################
-
-# Variables
-left_sep=''
-right_sep=''
-left_alt_sep=''
-right_alt_sep=''
-
-set -g @cpu_low_icon "=" # icon when cpu is low
-set -g @cpu_medium_icon "≡" # icon when cpu is medium
-set -g @cpu_high_icon "≣" # icon when cpu is high
-
-set -g @ram_low_fg_color "#[fg=#000000]" # foreground color when ram is low
-set -g @ram_medium_fg_color "#[fg=#000000]" # foreground color when ram is medium
-set -g @ram_high_fg_color "#[fg=#000000]" # foreground color when ram is high
-
-set -g @cpu_low_fg_color "#[fg=#000000]" # foreground color when cpu is low
-set -g @cpu_medium_fg_color "#[fg=#000000]" # foreground color when cpu is medium
-set -g @cpu_high_fg_color "#[fg=#000000]" # foreground color when cpu is high
-
-set -g @cpu_low_bg_color "#[bg=green]" # background color when cpu is low
-set -g @cpu_medium_bg_color "#[bg=yellow]" # background color when cpu is medium
-set -g @cpu_high_bg_color "#[bg=red]" # background color when cpu is high
-
-# set -g @cpu_low_fg_color "#[fg=#83bd68]"
-# set -g @cpu_medium_fg_color "#[fg=#f0c674]"
-# set -g @cpu_high_fg_color "#[fg=#cc6666]"
-
-# panes
-
-
-## Status Basr
-set -g status-position bottom
-set -g status-style bg=colour234,fg=colour238,dim
-set -g status-left-length 20
-set -g status-left ''
-set -g status-interval 2
-
-# Messages
-set -g message-style bold,fg=colour232,bg=colour81
-
-# Window Mode
-
-
-# Window Status
-set -g status-style fg=colour137,bg=colour234,dim
-
-set-option -g visual-activity off
-set-option -g visual-bell off
-set-option -g visual-silence off
-set-window-option -g monitor-activity off
-set-option -g bell-action none
-
-
-# Modes
-setw -g clock-mode-colour colour135
-setw -g mode-style bg=colour6,fg=colour0,bold,fg=colour46,bg=colour238
-
-
-# Panes
-setw -g clock-mode-colour cyan
-
-set -g mode-style bg=brightcyan,fg=black
-set -g message-style bg=brightblack,fg=cyan
-set -g message-command-style bg=brightblack,fg=cyan
-
-set -g status-style fg=white,bg=default
-set -g status-left '#{?pane_synchronized, ¤ ,}#{?window_zoomed_flag, ↕ ,}'
-
-set -g status-right "#{cpu_bg_color}#{cpu_fg_color} CPU:#{cpu_percentage}  #{fg=black}$right_alt_sep#{ram_fg_color}#{ram_bg_color}  RAM:#{ram_percentage} #{ram_bg_color} #[fg=black]$right_sep#[fg=default]#[bg=default] #H"
-set -g status-right-length 55
-
-set -g pane-border-style fg=brightblack,bg=default
-set -g pane-active-border-style fg=colour104,bg=default
-
-set-window-option -g window-status-style fg=colour104,bg=default
-set-window-option -g window-status-current-style fg=colour147,bg=default
-set-window-option -g window-status-activity-style bg=default,fg=yellow
-set-window-option -g window-status-separator "  #[fg=colour104]#[bg=default]$left_alt_sep  "
-
-# Custom styling, http://www.hamvocke.com/blog/a-guide-to-customizing-your-tmux-conf/
diff --git a/tmux/.tmux/plugins/tmux-continuum b/tmux/.tmux/plugins/tmux-continuum
index 3e4bc35..0698e8f 160000
--- a/tmux/.tmux/plugins/tmux-continuum
+++ b/tmux/.tmux/plugins/tmux-continuum
@@ -1 +1 @@
-Subproject commit 3e4bc35da41f956c873aea716c97555bf1afce5d
+Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0
diff --git a/tmux/.tmux/plugins/tmux-prefix-highlight b/tmux/.tmux/plugins/tmux-prefix-highlight
new file mode 160000
index 0000000..489a961
--- /dev/null
+++ b/tmux/.tmux/plugins/tmux-prefix-highlight
@@ -0,0 +1 @@
+Subproject commit 489a96189778a21d2f5f4dbbbc0ad2cec8f6c854
diff --git a/tmux/.tmux/plugins/tmux-weather b/tmux/.tmux/plugins/tmux-weather
new file mode 160000
index 0000000..28a5fbe
--- /dev/null
+++ b/tmux/.tmux/plugins/tmux-weather
@@ -0,0 +1 @@
+Subproject commit 28a5fbe75bb25a408193d454304e28ddd75e9338
diff --git a/zsh/.bash_profile b/zsh/.bash_profile
index 17b774a..b13ca4b 100644
--- a/zsh/.bash_profile
+++ b/zsh/.bash_profile
@@ -1,3 +1,4 @@
+# vi: ft=sh
 export PATH=$PATH:$HOME/bin
 export PATH=$PATH:$HOME/scripts
 
diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google
index 3294609..a0abb29 100644
--- a/zsh/.bash_profile.google
+++ b/zsh/.bash_profile.google
@@ -63,10 +63,10 @@ alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshor
 alias builddoctor=/google/bin/releases/build-doctor/builddoctor
 alias rudi=/google/data/ro/teams/lsc/bin/rudi-cli
 alias rudi-cli=/google/data/ro/teams/lsc/bin/rudi-cli
-alias tmux=tmx2
 alias graphviz=/google/data/ro/projects/graphviz-server/graphviz
 alias xrefs=/google/bin/releases/grok/tools/xrefs
-compdef tmx2=tmux
+# alias tmux=tmx2
+# compdef tmx2=tmux
 
 export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh
 export PATH=$PATH:/usr/local/google/home/cnieves/.local/binexport PATH=$PATH:/usr/local/google/home/cnieves/.local/bin