diff --git a/zsh/zshrc b/zsh/zshrc
index c1ed28a..8f73ea9 100755
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -212,8 +212,8 @@ eval exitCode='%(0?..${bWhiteOnRed}-%?-${none} )'
 eval dirpath='${bGreen}%(4~!.../%3~!%~)${none}'
 eval job='%(1j.${bYellow}[%j] .)'
 #hist="${whiteOnBlue}%5h${none}|"
-eval user='%(0#.${bRed}.${bBlue})%n${none}'
-eval at='${grey}@${none}'
+eval user='%(0#.${bRed}.${yellow})%n${none}'
+eval at='${blue}@${none}'
 
 case $HOSTNAME in
 Samis-MacBook)
@@ -235,23 +235,16 @@ esac
 
 eval host='${host}%m${none}'
 
-# moved dir to rprompt
-#PROMPT=`echo -n "${hist}${exitCode}${job}${user}${at}${host}${grey}:${none}${dirpath}${bWhite}%#${none} "`
-
 if [[ "x$INSIDE_EMACS" != "x" ]] || [[ "$EMACS" = "t" ]]; then
     export PROMPT="%d %% "
     export PAGER=cat
     export MANPAGER=cat
 else
-    PROMPT=`echo -n "${exitCode}${job}${user}${at}${host}${bWhite}%#${none} "`
-    RPROMPT=`echo -n "${blue}[${dirpath}${blue}]${none} %t"`
+    PROMPT=`echo -n "${exitCode}${job}${dirpath} ${git} ${bWhite}%#${none} "`
+    RPROMPT=`echo -n "${user}${at}${host}"`
     eval export PROMPT=$'${PROMPT}'
 fi
 
-# PROMPT=`echo -n "${exitCode}${job}${user}${at}${host}${bWhite}%#${none} "`
-# eval export PROMPT=$'${PROMPT}'
-# RPROMPT=`echo -n "${blue}[${dirpath}${blue}]${none} %t"`
-
 
 # 7. Aliases
 # ===========