diff --git a/themes/colorcli.debianred.tmux b/themes/colorcli.debianred.tmux
index 9ea8245..fb7146d 100644
--- a/themes/colorcli.debianred.tmux
+++ b/themes/colorcli.debianred.tmux
@@ -31,22 +31,21 @@ white="#efefef"
 ### }}}
 
 # DESIGN: PANES
-#set -g pane-active-border-style fg=colour24,bg=colour250
-set -g pane-active-border-style fg=color125,bg=colour250
-set -g pane-border-style fg=colour250,bg=colour250
+set -g pane-active-border-style fg=color125,bg=color250
+set -g pane-border-style fg=color250,bg=color250
 
 # DESIGN: MESSAGING
 set -g message-command-style fg=blue,bg=black
-#set -g message-style fg=colour59,bg=colour226
-set -g message-style fg=colour59,bg=colour220
+#set -g message-style fg=color59,bg=color226
+set -g message-style fg=color59,bg=color220
 
 # DESIGN: MODES
-#setw -g clock-mode-colour colour135
-setw -g clock-mode-colour colour125
-set -g mode-style fg=colour160,bold,bg=colour238,bold
+#setw -g clock-mode-color color135
+setw -g clock-mode-colour color125
+set -g mode-style fg=color160,bold,bg=color238,bold
 
 # DESIGN: STATUSBAR BOTTOM
-set -g status-style fg=white,bg=colour250
+set -g status-style fg=white,bg=color250
 set -g status-interval 2
 set -g status-position bottom
 
@@ -60,9 +59,9 @@ set -g status-position bottom
 # new: window-style
 setw -g window-status-format " #F#I:#W#F "
 setw -g window-status-current-format " #F#I:#W#F "
-setw -g window-status-format "#[fg=white]#[bg=colour59] #I #[fg=colour59]#[bg=colour254] #W "
-#setw -g window-status-current-format "#[fg=white]#[bg=colour24] #I #[fg=colour24]#[bg=colour254] #W "
-setw -g window-status-current-format "#[fg=color255]#[bg=colour125] #I #[fg=colour125]#[bg=colour254] #W "
+setw -g window-status-format "#[fg=white]#[bg=color59] #I #[fg=color59]#[bg=color254] #W "
+#setw -g window-status-current-format "#[fg=white]#[bg=color24] #I #[fg=color24]#[bg=color254] #W "
+setw -g window-status-current-format "#[fg=color255]#[bg=color125] #I #[fg=color125]#[bg=color254] #W "
 #setw -g window-status-current-bg pink
 #setw -g window-status-current-fg grey
 #setw -g window-status-current-attr dim
@@ -72,9 +71,9 @@ set -g status-left-length 20
 # items left to the tabs
 set -g status-left ''
 # items right to the tabs
-set -g status-right '#[fg=colour125,bg=colour250,bold] #H #[fg=colour59,bg=colour250,bold]| %H:%M |#[fg=colour59,bg=colour250,bold] %y-%m-%d '
-if '[ -z "$DISPLAY" ]' 'set -g status-right "#H #(acpi | cut -d \" \" -f4) [#[fg=colour125,bright]%H:%M:%S#[default]]"'
+set -g status-right '#[fg=color125,bg=color250,bold] #H #[fg=color59,bg=color250,bold]| %H:%M |#[fg=color59,bg=color250,bold] %y-%m-%d '
+if '[ -z "$DISPLAY" ]' 'set -g status-right "#H #(acpi | cut -d \" \" -f4) [#[fg=color125,bright]%H:%M:%S#[default]]"'
 #set -g status-right ''
 
 setw -g window-status-bell-style fg=red,bold
-set-window-option -g window-status-bell-style bg=colour160
+set-window-option -g window-status-bell-style bg=color160
diff --git a/themes/colorcli.tmux b/themes/colorcli.tmux
index 316d7c4..ea3f21c 100644
--- a/themes/colorcli.tmux
+++ b/themes/colorcli.tmux
@@ -3,7 +3,8 @@
 # From : https://github.com/jonasjacek/colorcli
 # Changes:
 # * Update status-right
-# * Main background lighter to mark the difference with local tmux
+# * Invert forground (color24) and background (black/grey) to increase difference
+#   with local tmux.
 #
 # DESIGN
 #
@@ -11,19 +12,19 @@
 setw -g default-terminal "screen-256color"
 
 # DESIGN: PANES
-set -g pane-active-border-style fg=colour24,bg=color255
-set -g pane-border-style fg=color255,bg=color255
+set -g pane-active-border-style fg=color24
+set -g pane-border-style fg=color24
 
 # DESIGN: MESSAGING
 set -g message-command-style fg=blue,bg=black
-set -g message-style fg=colour59,bg=colour226
+set -g message-style fg=color59,bg=color226
 
 # DESIGN: MODES
-setw -g clock-mode-colour colour135
-set -g mode-style fg=colour160,bold,bg=colour238,bold
+setw -g clock-mode-colour color135
+set -g mode-style fg=color160,bold,bg=color238,bold
 
 # DESIGN: STATUSBAR BOTTOM
-set -g status-style fg=white,bg=color255
+set -g status-style fg=white,bg=color24
 set -g status-interval 2
 set -g status-position bottom
 
@@ -37,8 +38,8 @@ set -g status-position bottom
 # new: window-style
 setw -g window-status-format " #F#I:#W#F "
 setw -g window-status-current-format " #F#I:#W#F "
-setw -g window-status-format "#[fg=white]#[bg=colour59] #I #[fg=colour59]#[bg=colour254] #W "
-setw -g window-status-current-format "#[fg=color255]#[bg=colour24] #I #[fg=colour24]#[bg=colour254] #W "
+setw -g window-status-format "#[fg=color0,bold]#[bg=color24]#I:#W "
+setw -g window-status-current-format "#[fg=color255]#[bg=color0]#I:#[fg=color24,bold]#W "
 #setw -g window-status-current-bg pink
 #setw -g window-status-current-fg grey
 #setw -g window-status-current-attr dim
@@ -49,10 +50,10 @@ set -g status-left-length 20
 # items left to the tabs
 set -g status-left ''
 # items right to the tabs
-#set -g status-right '#[fg=colour59,bg=color255,bold] %y/%m/%d |#[fg=colour59,bg=color255,bold] %H:%M:%S '
+#set -g status-right '#[fg=color59,bg=color24,bold] %y/%m/%d |#[fg=color59,bg=color24,bold] %H:%M:%S '
 # #(cat /proc/loadavg | cut -d " " -f 1,2,3) : CPU load
-set -g status-right '#[fg=colour24,bg=color255,bold] #H #[fg=colour59,bg=color255,bold][ #[fg=colour232,bg=color255,bold]#(cat /proc/loadavg | cut -d " " -f 1)#[fg=colour236,bg=color255,bold] #(cat /proc/loadavg | cut -d " " -f 2)#[fg=colour242,bg=color255,bold] #(cat /proc/loadavg | cut -d " " -f 3) #[fg=colour59,bg=color255,bold]]'
+set -g status-right '#[fg=color255,bg=color24,bold] #H #[fg=color0,bg=color24,bold][ #[fg=color232,bg=color24,bold]#(cat /proc/loadavg | cut -d " " -f 1)#[fg=color234,bg=color24,bold] #(cat /proc/loadavg | cut -d " " -f 2)#[fg=color236,bg=color24,bold] #(cat /proc/loadavg | cut -d " " -f 3) #[fg=color0,bg=color24,bold]]'
 #set -g status-right ''
 
 setw -g window-status-bell-style fg=red,bold
-set-window-option -g window-status-bell-style bg=colour160
+set-window-option -g window-status-bell-style bg=color160