diff --git a/tmux/themes/powerline-block-blue.tmuxtheme b/tmux/themes/powerline-block-blue.tmuxtheme
index fff3175..620a2fa 100644
--- a/tmux/themes/powerline-block-blue.tmuxtheme
+++ b/tmux/themes/powerline-block-blue.tmuxtheme
@@ -9,13 +9,13 @@ set -g status-bg colour233
 set -g status-left-bg colour233
 set -g status-left-fg colour243
 set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour24,bold] #S #[fg=colour24,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
+set -g status-left "#[fg=colour232,bg=colour24,bold] #S #[fg=colour24,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
 
 # Right side of status bar
 set -g status-right-bg colour233
 set -g status-right-fg colour243
 set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour235,bg=colour245,bold] #H "
+set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour232,bg=colour245,bold] #H "
 
 # Window status
 set -g window-status-format " #I:#W#F "
@@ -23,7 +23,7 @@ set -g window-status-current-format " #I:#W#F "
 
 # Current window status
 set -g window-status-current-bg colour24
-set -g window-status-current-fg colour233
+set -g window-status-current-fg colour232
 
 # Window with activity status
 set -g window-status-activity-bg colour31  # fg and bg are flipped here due to
diff --git a/tmux/themes/powerline-block-green.tmuxtheme b/tmux/themes/powerline-block-green.tmuxtheme
index 219e1e3..512916d 100644
--- a/tmux/themes/powerline-block-green.tmuxtheme
+++ b/tmux/themes/powerline-block-green.tmuxtheme
@@ -9,13 +9,13 @@ set -g status-bg colour233
 set -g status-left-bg colour233
 set -g status-left-fg colour243
 set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour100,bold] #S #[fg=colour100,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
+set -g status-left "#[fg=colour232,bg=colour100,bold] #S #[fg=colour100,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
 
 # Right side of status bar
 set -g status-right-bg colour233
 set -g status-right-fg colour243
 set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour235,bg=colour245,bold] #H "
+set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour232,bg=colour245,bold] #H "
 
 # Window status
 set -g window-status-format " #I:#W#F "
@@ -23,7 +23,7 @@ set -g window-status-current-format " #I:#W#F "
 
 # Current window status
 set -g window-status-current-bg colour100
-set -g window-status-current-fg colour233
+set -g window-status-current-fg colour232
 
 # Window with activity status
 set -g window-status-activity-bg colour107 # fg and bg are flipped here due to
diff --git a/tmux/themes/powerline-block-red.tmuxtheme b/tmux/themes/powerline-block-red.tmuxtheme
index baf0ab6..7899ac3 100644
--- a/tmux/themes/powerline-block-red.tmuxtheme
+++ b/tmux/themes/powerline-block-red.tmuxtheme
@@ -15,7 +15,7 @@ set -g status-left "#[fg=colour16,bg=colour88,bold] #S #[fg=colour88,bg=colour24
 set -g status-right-bg colour233
 set -g status-right-fg colour243
 set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour235,bg=colour245,bold] #H "
+set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour232,bg=colour245,bold] #H "
 
 # Window status
 set -g window-status-format " #I:#W#F "
diff --git a/tmux/themes/powerline-default-blue.tmuxtheme b/tmux/themes/powerline-default-blue.tmuxtheme
index d3e8c9b..2b2ee6a 100644
--- a/tmux/themes/powerline-default-blue.tmuxtheme
+++ b/tmux/themes/powerline-default-blue.tmuxtheme
@@ -9,13 +9,13 @@ set -g status-bg colour233
 set -g status-left-bg colour233
 set -g status-left-fg colour243
 set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour24,bold] #S #[fg=colour24,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
+set -g status-left "#[fg=colour232,bg=colour24,bold] #S #[fg=colour24,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
 
 # Right side of status bar
 set -g status-right-bg colour233
 set -g status-right-fg colour243
 set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour235,bg=colour245,bold] #H "
+set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour232,bg=colour245,bold] #H "
 
 # Window status
 set -g window-status-format "  #I:#W#F  "
diff --git a/tmux/themes/powerline-default-gray.tmuxtheme b/tmux/themes/powerline-default-gray.tmuxtheme
index 124c8fb..8db07be 100644
--- a/tmux/themes/powerline-default-gray.tmuxtheme
+++ b/tmux/themes/powerline-default-gray.tmuxtheme
@@ -9,13 +9,13 @@ set -g status-bg colour233
 set -g status-left-bg colour233
 set -g status-left-fg colour243
 set -g status-left-length 40
-set -g status-left "#[fg=colour235,bg=colour245,bold] #S #[fg=colour245,bg=colour240,nobold]⮀#[fg=colour234,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
+set -g status-left "#[fg=colour232,bg=colour245,bold] #S #[fg=colour245,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
 
 # Right side of status bar
 set -g status-right-bg colour233
 set -g status-right-fg colour243
 set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour234,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour235,bg=colour245,bold] #H "
+set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour232,bg=colour245,bold] #H "
 
 # Window status
 set -g window-status-format "  #I:#W#F  "
diff --git a/tmux/themes/powerline-default-green.tmuxtheme b/tmux/themes/powerline-default-green.tmuxtheme
index fd552ed..d70f813 100644
--- a/tmux/themes/powerline-default-green.tmuxtheme
+++ b/tmux/themes/powerline-default-green.tmuxtheme
@@ -9,13 +9,13 @@ set -g status-bg colour233
 set -g status-left-bg colour233
 set -g status-left-fg colour243
 set -g status-left-length 40
-set -g status-left "#[fg=colour233,bg=colour100,bold] #S #[fg=colour100,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
+set -g status-left "#[fg=colour232,bg=colour100,bold] #S #[fg=colour100,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
 
 # Right side of status bar
 set -g status-right-bg colour233
 set -g status-right-fg colour243
 set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour235,bg=colour245,bold] #H "
+set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour232,bg=colour245,bold] #H "
 
 # Window status
 set -g window-status-format "  #I:#W#F  "
diff --git a/tmux/themes/powerline-default-red.tmuxtheme b/tmux/themes/powerline-default-red.tmuxtheme
index d1b49f9..45e3e0b 100644
--- a/tmux/themes/powerline-default-red.tmuxtheme
+++ b/tmux/themes/powerline-default-red.tmuxtheme
@@ -9,13 +9,13 @@ set -g status-bg colour233
 set -g status-left-bg colour233
 set -g status-left-fg colour243
 set -g status-left-length 40
-set -g status-left "#[fg=colour232,bg=colour88,bold] #S #[fg=colour88,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
+set -g status-left "#[fg=colour16,bg=colour88,bold] #S #[fg=colour88,bg=colour240,nobold]⮀#[fg=colour233,bg=colour240] #(whoami) #[fg=colour240,bg=colour235]⮀#[fg=colour240,bg=colour235] #I:#P #[fg=colour235,bg=colour233,nobold]⮀"
 
 # Right side of status bar
 set -g status-right-bg colour233
 set -g status-right-fg colour243
 set -g status-right-length 150
-set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour235,bg=colour245,bold] #H "
+set -g status-right "#[fg=colour235,bg=colour233]⮂#[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]⮂#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour245,bg=colour240]⮂#[fg=colour232,bg=colour245,bold] #H "
 
 # Window status
 set -g window-status-format "  #I:#W#F  "