diff --git a/.tmux.theme b/.tmux.theme
index fbb5255..32158b7 100644
--- a/.tmux.theme
+++ b/.tmux.theme
@@ -1,19 +1,9 @@
 # tmux theme
 
-###################
-# Color
-##################
-#+ accent = #56c9e4
-#+ secondary = #011f2a
-#+ COLOR_TERTIARY = #0f63bd
-
 set -g default-terminal "screen-256color"
 if 'infocmp -x tmux-256color > /dev/null 2>&1' 'set -g default-terminal "tmux-256color"'
 
-#set -g @prefix_highlight_fg black
-#set -g @prefix_highlight_bg brightcyan
-
-#+--- tmux-prefix-highlight 
+#+--- tmux-prefix-highlight ---+
 set -g @prefix_highlight_output_prefix "#[fg=#${COLOR_TERTIARY}]#[bg=default]#[nobold]#[noitalics]#[nounderscore]#[bg=#${COLOR_TERTIARY}]#[fg=white] "
 set -g @prefix_highlight_output_suffix "#[bg=#${COLOR_TERTIARY}]#[fg=black] "
 #set -g @prefix_highlight_copy_mode_attr "fg=brightcyan,bg=black,bold"-
@@ -21,17 +11,17 @@ set -g @prefix_highlight_output_suffix "#[bg=#${COLOR_TERTIARY}]#[fg=black] "
 #set -g @prefix_highlight_bg '#${COLOR_TERTIARY}'
 
 #+--------- Panes
-set -g pane-border-style fg='#${COLOR_SECONDARY}',bg=default
-set -g pane-active-border-style fg='#${COLOR_TERTIARY}',bg=default
+set -g pane-border-style "fg=${COLOR_SECONDARY},bg=default"
+set -g pane-active-border-style "fg=${COLOR_TERTIARY},bg=default"
 
-set -g window-style fg=#848a86,bg=default
+set -g window-style "fg=#848a86,bg=default"
 set -g window-active-style 'fg=#EEEEEE,bg=default'
 
 
 #+----- Bar Style
 set -g status-style fg=white,bg=default
 set -g status-left "#[fg=white,bg=#${COLOR_TERTIARY},bold,noitalics,nounderscore] #S #[fg=#${COLOR_TERTIARY},bg=default,nobold,noitalics,nounderscore]"
-set -g status-right "#{prefix_highlight}#[fg=#${COLOR_SECONDARY},bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=#${COLOR_SECONDARY}] %Y-%m-%d #[fg=white,bg=#${COLOR_SECONDARY},nobold,noitalics,nounderscore]#[fg=white,bg=#${COLOR_SECONDARY}] %H:%M #[fg=#${COLOR_ACCENT},bg=#${COLOR_SECONDARY},nobold,noitalics,nounderscore]#[fg=black,bg=#${COLOR_ACCENT},nobold] #H "
+set -g status-right "#{prefix_highlight}#[fg=#${COLOR_SECONDARY},bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=#${COLOR_SECONDARY}] %Y-%m-%d #[fg=white,bg=#${COLOR_SECONDARY},nobold,noitalics,nounderscore]#[fg=white,bg=#${COLOR_SECONDARY}] %H:%M #[fg=#${COLOR_TERTIARY},bg=#${COLOR_SECONDARY},nobold,noitalics,nounderscore]#[fg=white,bg=#${COLOR_TERTIARY},nobold] #H "
 
 #+----- Windows
 set -g window-status-format "#[fg=black,bg=#${COLOR_SECONDARY},nobold,noitalics,nounderscore] #[fg=white,bg=#${COLOR_SECONDARY}]#I #[fg=white,bg=#${COLOR_SECONDARY},nobold,noitalics,nounderscore] #[fg=white,bg=#${COLOR_SECONDARY}]#W #F #[fg=#${COLOR_SECONDARY},bg=default,nobold,noitalics,nounderscore]"
@@ -39,4 +29,4 @@ set -g window-status-current-format "#[fg=black,bg=#${COLOR_ACCENT},nobold] #
 set -g window-status-separator ""
 
 #+----- Messages
-set -g message-style fg=black,bg=#${COLOR_ACCENT}
+set -g message-style "fg=black,bg=${COLOR_ACCENT}"