diff --git a/config/tmux/theme-dark.conf b/config/tmux/theme-dark.conf
index f9895a5..32d70f5 100644
--- a/config/tmux/theme-dark.conf
+++ b/config/tmux/theme-dark.conf
@@ -1,5 +1,7 @@
-set-option -g status-style 'bg=default,fg=#cad3f5'
-set-window-option -g window-status-style 'fg=#cad3f5,bg=default'
-set-window-option -g window-status-current-style 'fg=#cad3f5,bg=#24273a'
+set-option -g status-style 'fg=#cad3f5,bg=default'
+set-window-option -g window-status-style 'fg=#cad3f5,bg=default dim'
+set-window-option -g window-status-current-style 'fg=#04a5e5,bg=default'
+set-window-option -g window-status-activity-style 'fg=#cad3f5,bg=default nodim'
+set-window-option -g window-status-bell-style 'fg=#cad3f5,bg=default'
 set -g message-style 'fg=#c6a0f6 bg=#24273a bold'
 
diff --git a/config/tmux/theme-light.conf b/config/tmux/theme-light.conf
index b6eed40..393d6d4 100644
--- a/config/tmux/theme-light.conf
+++ b/config/tmux/theme-light.conf
@@ -1,5 +1,7 @@
-set-option -g status-style 'bg=#eff1f5,fg=#4c4f69'
-set-window-option -g window-status-style 'fg=#4c4f69,bg=#eff1f5'
-set-window-option -g window-status-current-style 'fg=#4c4f69,bg=#7aa2f7'
+set-option -g status-style 'fg=#4c4f69,bg=#eff1f5'
+set-window-option -g window-status-style 'fg=#4c4f69,bg=#eff1f5 dim'
+set-window-option -g window-status-current-style 'fg=#8839ef,bg=#7aa2f7'
+set-window-option -g window-status-activity-style 'fg=#4c4f69,bg=#eff1f5 nodim'
+set-window-option -g window-status-bell-style 'fg=#4c4f69,bg=#eff1f5'
 set -g message-style 'fg=#8839ef bg=#e6e9ef bold' # fg magenta, bg black
 
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 319f99d..e485447 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -1,6 +1,6 @@
 # ~/.config/tmux/tmux.conf, or .dotfiles/config/tmux/tmux.conf
 #
-# Contains configuration from the follwing sources:
+# Contains configuration from the following sources:
 # - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html
 # - https://github.com/dreamsofcode-io/tmux/blob/main/tmux.conf
 
@@ -25,10 +25,6 @@ bind -n M-Right select-pane -R
 bind -n M-Up    select-pane -U
 bind -n M-Down  select-pane -D
 
-# Control-Tab & Control-Shift-Tab to switch windows
-bind -n C-Tab   previous-window
-bind -n C-S-Tab next-window
-
 # Reload tmux config with <prefix> + r
 bind r source-file ~/.dotfiles/config/tmux/tmux.conf \; display "tmux cfg reloaded!"
 
@@ -57,9 +53,6 @@ bind y setw synchronize-panes
 unbind [
 bind Escape copy-mode
 
-# start selection with 'space' and copy using 'y'
-#bind -t vi-copy 'y' copy-selection
-
 # paste using 'p'
 unbind p
 bind p paste-buffer
@@ -117,14 +110,12 @@ set-option -g status-position "bottom"
 set-option -g status-justify left
 set-option -g status-left ''
 set-option -g window-status-format ' #I:#W '
-set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag,  , } '
+set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag, ◈ ,} '
 
 set-option -g status-right "#{hostname_short}/#S #{tmux_mode_indicator}"
 
-set-option -g status-style 'fg=#cad3f5,bg=default'
-set-window-option -g window-status-style 'fg=#cad3f5,bg=default'
-set-window-option -g window-status-current-style 'fg=#c6a0f6,bg=#24273a'
-set -g message-style 'fg=#c6a0f6 bg=#24273a bold'
+set -g pane-border-style "fg=#3b4261"
+set -g pane-active-border-style "fg=#7aa2f7"
 
 # https://github.com/erikw/tmux-dark-notify
 set -g @dark-notify-theme-path-light '~/.dotfiles/config/tmux/theme-light.conf'
@@ -147,7 +138,7 @@ set -g @tmux_window_name_max_name_len "20"
 set -g @tmux_window_name_use_tilde "True"
 set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh', 'oh-my-posh']"
 set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh']" # Default is []
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh', 'antidot']" # Default is []
 set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local')]"
 
 ## https://github.com/tmux-plugins/tmux-continuum
@@ -178,3 +169,6 @@ run-shell ~/.dotfiles/config/tmux/plugins/tmux-yank/yank.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-current-pane-hostname/current_pane_hostname.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-dark-notify/main.tmux
 
+if-shell "test -e $HOME/.local/state/tmux/tmux-dark-notify-theme.conf" \
+  "source-file $HOME/.local/state/tmux/tmux-dark-notify-theme.conf"
+