diff --git a/tmux-nordone.tmux b/tmux-nordone.tmux
old mode 100644
new mode 100755
index 04d4997..8141fa2
--- a/tmux-nordone.tmux
+++ b/tmux-nordone.tmux
@@ -30,24 +30,22 @@ case $TC in
         TC='#81a1c1'
         G01='#2e3440'
         G02='#3b4252'
-        G03='#434c5e'
-        G04='#4c566a'
-        G05='#d8dee9'
-        G06='#eceff4'
+        G03='#4c566a'
+        G04='#d8dee9'
+        G05='#eceff4'
 
-        FG="$G05"
+        FG="$G04"
         BG="$G02"
         ;;
     'onedark')
         TC='#61afef'
         G01='#282c34'
         G02='#3e4452'
-        G03='#4b5263'
-        G04='#5c6470'
-        G05='#abb2bf'
-        G06='#dfdfdf'
+        G03='#5c6470'
+        G04='#abb2bf'
+        G05='#dfdfdf'
 
-        FG="$G05"
+        FG="$G04"
         BG="$G02"
         ;;
 esac
@@ -70,28 +68,28 @@ tmux_set @prefix_highlight_output_prefix "#[fg=$TC]#[bg=$BG]$left_arrow_icon#[bg
 tmux_set @prefix_highlight_output_suffix "#[fg=$TC]#[bg=$BG]$right_arrow_icon"
 
 # Left side of status bar
-tmux_set status-left-bg "$G02"
-tmux_set status-left-fg "$G06"
+tmux_set status-left-bg "$BG"
+tmux_set status-left-fg "$FG"
 tmux_set status-left-length 150
 user="$(whoami)"
-LS="#[fg=$G01,bg=$TC,bold] $user_icon $user@#h #[fg=$TC,bg=$G03,nobold]$right_arrow_icon#[fg=$TC,bg=$G03] $session_icon #S "
+LS="#[fg=$G01,bg=$TC,bold] $user_icon $user@#h #[fg=$TC,bg=$BG,nobold]$right_arrow_icon#[fg=$BG,bg=$G03]$right_arrow_icon#[fg=$FG,bg=$G03] $session_icon  #S #[fg=$G03,bg=$BG]$right_arrow_icon"
 if [[ $prefix_highlight_pos == 'L' || $prefix_highlight_pos == 'LR' ]]; then
     LS="$LS#{prefix_highlight}"
 fi
 tmux_set status-left "$LS"
 
 # Right side of status bar
-tmux_set status-right-bg "$G02"
-tmux_set status-right-fg "$G06"
+tmux_set status-right-bg "$BG"
+tmux_set status-right-fg "$FG"
 tmux_set status-right-length 150
-RS="#[fg=$TC,bg=$G03] $time_icon $time_format #[fg=$TC,bg=$G03]$left_arrow_icon#[fg=$G01,bg=$TC] $date_icon $date_format "
+RS="#[fg=$G03,bg=$BG]$left_arrow_icon#[fg=$FG,bg=$G03] $time_icon  $time_format #[fg=$BG,bg=$G03]$left_arrow_icon#[fg=$TC,bg=$BG]$left_arrow_icon#[fg=$G01,bg=$TC] $date_icon  $date_format "
 if [[ $prefix_highlight_pos == 'R' || $prefix_highlight_pos == 'LR' ]]; then
     RS="#{prefix_highlight}$RS"
 fi
 tmux_set status-right "$RS"
 
 # Window status
-tmux_set window-status-format " #I:#W#F "
+tmux_set window-status-format "#[fg=$BG,bg=$G03]$right_arrow_icon#[fg=$G05,bg=$G03] #I:#W#F #[fg=$G03,bg=$BG]$right_arrow_icon"
 tmux_set window-status-current-format "#[fg=$BG,bg=$TC]$right_arrow_icon#[fg=$G01,bg=$TC,bold] #I:#W#F #[fg=$TC,bg=$BG,nobold]$right_arrow_icon"
 
 # Window separator
@@ -101,13 +99,13 @@ tmux_set window-status-separator ""
 tmux_set status-justify centre
 
 # Current window status
-tmux_set window-status-current-statys "fg=$TC,bg=$BG"
+tmux_set window-status-current-status "fg=$TC,bg=$BG"
 
 # Pane border
-tmux_set pane-border-style "fg=$G04,bg=default"
+tmux_set pane-border-style "fg=$G03,bg=default"
 
 # Active pane border
-tmux_set pane-active-border-style "fg=$TC,bg=$BG"
+tmux_set pane-active-border-style "fg=$TC,bg=default"
 
 # Pane number indicator
 tmux_set display-panes-colour "$G03"
@@ -124,4 +122,4 @@ tmux_set message-style "fg=$TC,bg=$BG"
 tmux_set message-command-style "fg=$TC,bg=$BG"
 
 # Copy mode highlight
-tmux_set mode-style "bg=$TC,fg=$FG"
+tmux_set mode-style "bg=$TC,fg=$G01"