diff --git a/powerline.zsh-theme b/powerline.zsh-theme
index 0512fd1..43377ad 100644
--- a/powerline.zsh-theme
+++ b/powerline.zsh-theme
@@ -1,33 +1,30 @@
 # FreeAgent puts the powerline style in zsh !
 
 
-POWERLINE_COLOR_BG_GRAY=$BG[240]
-POWERLINE_COLOR_BG_LIGHT_GRAY=$BG[240]
-POWERLINE_COLOR_BG_WHITE=$BG[255]
+POWERLINE_COLOR_BG_GRAY=%K{240}
+POWERLINE_COLOR_BG_LIGHT_GRAY=%K{240}
+POWERLINE_COLOR_BG_WHITE=%K{255}
 
-POWERLINE_COLOR_FG_GRAY=$FG[240]
-POWERLINE_COLOR_FG_LIGHT_GRAY=$FG[240]
-POWERLINE_COLOR_FG_WHITE=$FG[255]
+POWERLINE_COLOR_FG_GRAY=%F{240}
+POWERLINE_COLOR_FG_LIGHT_GRAY=%F{240}
+POWERLINE_COLOR_FG_WHITE=%F{255}
 
-GIT_DIRTY_COLOR=$FG[133]
-GIT_CLEAN_COLOR=$FG[118]
-GIT_PROMPT_INFO=$FG[012]
+GIT_DIRTY_COLOR=%F{133}
+GIT_CLEAN_COLOR=%F{118}
+GIT_PROMPT_INFO=%F{012}
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" \u2b60 "
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%}"
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
-ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
+ZSH_THEME_GIT_PROMPT_SUFFIX="$GIT_PROMPT_INFO"
+ZSH_THEME_GIT_PROMPT_DIRTY=" $GIT_DIRTY_COLOR✘ "
+ZSH_THEME_GIT_PROMPT_CLEAN=" $GIT_CLEAN_COLOR✔ "
 
-ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_ADDED="%F{082}✚%f"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%F{166}✹%f"
+ZSH_THEME_GIT_PROMPT_DELETED="%F{160}✖%f"
+ZSH_THEME_GIT_PROMPT_RENAMED="%F{220]➜%f"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%F{082]═%f"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{190]✭%f"
 
+PROMPT="%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} %1~"$'$(git_prompt_info)'" %k%f%F{blue}"$'\u2b80'"%f"
 
-
-PROMPT='
-'%{$bg[green]%}%{$fg[black]%}' '%n' '%{$reset_color%}%{$fg[green]%}%{$bg[blue]%}$'\u2b80'%{$reset_color%}%{$fg[white]%}%{$bg[blue]%}' '%1~$'$(git_prompt_info) '%{$reset_color%}%{$fg[blue]%}$'\u2b80%{$reset_color%} '
-
-RPROMPT=%{$POWERLINE_COLOR_FG_WHITE%}$' \u2b82%{$reset_color%}%{$POWERLINE_COLOR_BG_WHITE%} %{$POWERLINE_COLOR_FG_GRAY%}%D{%X}%  \u2b82%{$POWERLINE_COLOR_BG_GRAY%}%{$POWERLINE_COLOR_FG_WHITE%} %D{%Y-%m-%d}%f %{$reset_color%}'
+RPROMPT=$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY%D{%H:%M:%S}  "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE %D{%Y-%m-%d} %f%k"