diff --git a/main.tmuxtheme b/main.tmuxtheme
index faab47d..2e246ff 100644
--- a/main.tmuxtheme
+++ b/main.tmuxtheme
@@ -14,18 +14,15 @@ set -g status-interval 1
 
 # Basic status bar colors
 # Default
-set -g status-fg colour248
-set -g status-bg colour233
+set -g status-style fg=colour248,bg=colour233
 
 # Left side of status bar
-set -g status-left-bg colour233
-set -g status-left-fg colour243
+set -g status-left-style bg=colour233,fg=colour243
 set -g status-left-length 40
 set -g status-left "#[fg=colour232,bg=colour4] #S #[fg=colour4,bg=colour#{?client_prefix,220,244},nobold]#[fg=colour233,bg=colour#{?client_prefix,220,244}] #(whoami) #[fg=colour#{?client_prefix,220,244},bg=colour#{?pane_synchronized,88,236}]#[fg=colour248,bg=colour#{?pane_synchronized,88,236}] #I:#{?pane_synchronized,*,#P} #[fg=colour#{?pane_synchronized,88,236},bg=colour233,nobold]"
 
 # Right side of status bar
-set -g status-right-bg colour233
-set -g status-right-fg colour243
+set -g status-right-style bg=colour233,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=colour24,bg=colour240]#[fg=colour232,bg=colour24,bold] #H "
 #set -g status-right "#{?client_prefix,#[fg=colour220,bg=colour233]#[fg=colour49,bg=colour220] %H:%M:%S #[fg=colour240,bg=colour220],#[fg=colour235,bg=colour233]#[fg=colour49,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]}#[fg=colour233,bg=colour240] %Y-%m-%d #[fg=colour24,bg=colour240]#[fg=colour232,bg=colour24,bold] #H "
@@ -40,12 +37,10 @@ set -g window-status-format "  #I#[fg=colour#{?window_zoomed_flag,88,244}]#{?win
 set -g window-status-current-format "#[fg=colour233,bg=black]#[fg=colour87] #I#[fg=colour#{?window_zoomed_flag,1,244}]#{?window_zoomed_flag,+,\\}#[fg=colour87]#W #[fg=colour233,bg=black]"
 
 # Current window status
-set -g window-status-current-bg colour24
-set -g window-status-current-fg colour233
+set -g window-status-current-style bg=colour24,fg=colour233
 
 # Window with activity status
-set -g window-status-activity-bg colour245 # fg and bg are flipped here due to
-set -g window-status-activity-fg colour233 # a bug in tmux
+set -g window-status-activity-style bg=colour245,fg=colour233 # fg and bg are flipped here due to a bug in tmux
 
 # Window separator
 set -g window-status-separator ""
@@ -54,12 +49,10 @@ set -g window-status-separator ""
 set -g status-justify centre
 
 # Pane border
-set -g pane-border-bg colour0
-set -g pane-border-fg colour4
+set -g pane-border-style bg=colour0,fg=colour4
 
 # Active pane border
-set -g pane-active-border-bg colour4
-set -g pane-active-border-fg colour4
+set -g pane-active-border-style bg=colour4,fg=colour0
 
 # Pane number indicator
 set -g display-panes-colour colour233
@@ -70,13 +63,10 @@ set -g clock-mode-colour colour24
 set -g clock-mode-style 24
 
 # Message
-set -g message-bg colour4
-set -g message-fg black
+set -g message-style bg=colour4,fg=black
 
 # Command message
-set -g message-command-bg colour233
-set -g message-command-fg black
+set -g message-command-style bg=colour233,fg=black
 
 # Mode
-set -g mode-bg colour24
-set -g mode-fg colour231
+set -g mode-style bg=colour24,fg=colour231