diff --git a/README.md b/README.md
index 115733b..3a11925 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,13 @@ By default, at the right of the powerline are displayed the date and the time.
 If you don't want date or time, you can choose what you want to display:
 
 ```
-POWERLINE_RIGHT_A="date replacement"
-POWERLINE_RIGHT_B="time replacement"
+POWERLINE_RIGHT="date replacement"
+```
+
+If you don't want to display your username (the green or red (root) colors are still there):
+
+```
+POWERLINE_HIDE_USER_NAME="true"
 ```
 
 If you don't want the blank line before the prompt:
@@ -62,6 +67,18 @@ If you want to tell if you are in a remote SSH session:
 POWERLINE_DETECT_SSH="true"
 ```
 
+Also you can change the icons of GIT info, default values are:
+```
+POWERLINE_GIT_CLEAN="✔"
+POWERLINE_GIT_DIRTY="✘"
+POWERLINE_GIT_ADDED="%F{green}✚%F{black}"
+POWERLINE_GIT_MODIFIED="%F{blue}✹%F{black}"
+POWERLINE_GIT_DELETED="%F{red}✖%F{black}"
+POWERLINE_GIT_UNTRACKED="%F{yellow}✭%F{black}"
+POWERLINE_GIT_RENAMED="➜"
+POWERLINE_GIT_UNMERGED="═"
+```
+
 Requirements
 ------------
 
diff --git a/install_in_omz.sh b/install_in_omz.sh
index e5b3468..e3fb4ea 100755
--- a/install_in_omz.sh
+++ b/install_in_omz.sh
@@ -7,29 +7,13 @@ ln -f powerline.zsh-theme ~/.oh-my-zsh/themes/powerline.zsh-theme
 echo "
 Done ! (the symlink is ~/.oh-my-zsh/themes/powerline.zsh-theme)
 
------------------------------------------------------------------
+----------------------------------------------------------------------------------
 
 Options:
 All options must be overridden in your .zshrc file.
+See README.md for more info.
 
-By default, at the right of the powerline are displayed the date and the time. If you don't want date or time, you can choose what you want to display:
-
-POWERLINE_RIGHT_A=\"date replacement\"
-POWERLINE_RIGHT_B=\"time replacement\"
-If you don't want the blank line before the prompt:
-
-POWERLINE_NO_BLANK_LINE=\"true\"
-If you want full path:
-
-POWERLINE_FULL_CURRENT_PATH=\"true\"
-If you want git info on right instead of left:
-
-POWERLINE_SHOW_GIT_ON_RIGHT=\"true\"
-If you want to tell if you are in a remote SSH session:
-
-POWERLINE_DETECT_SSH=\"true\"
-
-----------------------------------------------------------------
+----------------------------------------------------------------------------------
 
 Requirements:
 Vim Powerline patched font: See Powerline for vim for more info.
diff --git a/powerline.zsh-theme b/powerline.zsh-theme
index bc88e7c..0e0d01e 100644
--- a/powerline.zsh-theme
+++ b/powerline.zsh-theme
@@ -1,11 +1,13 @@
 # FreeAgent puts the powerline style in zsh !
 
-if [ "$POWERLINE_RIGHT_B" = "" ]; then
-  POWERLINE_RIGHT_B=%D{%H:%M:%S}
+if [ "$POWERLINE_RIGHT" = "" ]; then
+  POWERLINE_RIGHT=%D{%H:%M:%S}
 fi
 
-if [ "$POWERLINE_RIGHT_A" = "" ]; then
-  POWERLINE_RIGHT_A=%D{%Y-%m-%d}
+if [ "$POWERLINE_HIDE_USER_NAME" = "" ]; then
+    POWERLINE_USER_NAME="%n"
+else
+    POWERLINE_USER_NAME=""
 fi
 
 POWERLINE_CURRENT_PATH="%d"
@@ -14,37 +16,72 @@ if [ "$POWERLINE_FULL_CURRENT_PATH" = "" ]; then
   POWERLINE_CURRENT_PATH="%1~"
 fi
 
-POWERLINE_GIT_INFO_LEFT=""
-POWERLINE_GIT_INFO_RIGHT="%F{red}"$'\ue0b2'"%F{black}%K{red}"$'$(git_prompt_info)'" %f"
-if [ "$POWERLINE_SHOW_GIT_ON_RIGHT" = "" ]; then
-    POWERLINE_GIT_INFO_LEFT=$'$(git_prompt_info)'
+if [ "$POWERLINE_GIT_CLEAN" = "" ]; then
+  POWERLINE_GIT_CLEAN="✔"
+fi
+
+if [ "$POWERLINE_GIT_DIRTY" = "" ]; then
+  POWERLINE_GIT_DIRTY="✘"
+fi
+
+if [ "$POWERLINE_GIT_ADDED" = "" ]; then
+  POWERLINE_GIT_ADDED="%F{green}✚%F{black}"
+fi
+
+if [ "$POWERLINE_GIT_MODIFIED" = "" ]; then
+  POWERLINE_GIT_MODIFIED="%F{blue}✹%F{black}"
+fi
+
+if [ "$POWERLINE_GIT_DELETED" = "" ]; then
+  POWERLINE_GIT_DELETED="%F{red}✖%F{black}"
+fi
+
+if [ "$POWERLINE_GIT_UNTRACKED" = "" ]; then
+  POWERLINE_GIT_UNTRACKED="%F{yellow}✭%F{black}"
+fi
+
+if [ "$POWERLINE_GIT_RENAMED" = "" ]; then
+  POWERLINE_GIT_RENAMED="➜"
+fi
+
+if [ "$POWERLINE_GIT_UNMERGED" = "" ]; then
+  POWERLINE_GIT_UNMERGED="═"
+fi
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" \ue0a0 "
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY=" $POWERLINE_GIT_DIRTY"
+ZSH_THEME_GIT_PROMPT_CLEAN=" $POWERLINE_GIT_CLEAN"
+
+ZSH_THEME_GIT_PROMPT_ADDED=" $POWERLINE_GIT_ADDED"
+ZSH_THEME_GIT_PROMPT_MODIFIED=" $POWERLINE_GIT_MODIFIED"
+ZSH_THEME_GIT_PROMPT_DELETED=" $POWERLINE_GIT_DELETED"
+ZSH_THEME_GIT_PROMPT_UNTRACKED=" $POWERLINE_GIT_UNTRACKED"
+ZSH_THEME_GIT_PROMPT_RENAMED=" $POWERLINE_GIT_RENAMED"
+ZSH_THEME_GIT_PROMPT_UNMERGED=" $POWERLINE_GIT_UNMERGED"
+ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="AHEAD"
+ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="BEHIND"
+ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="DIVERGED"
+
+if [ "$(git_prompt_info)" = "" ]; then
+    POWERLINE_GIT_INFO_LEFT=""
     POWERLINE_GIT_INFO_RIGHT=""
+else
+    if [ "$POWERLINE_SHOW_GIT_ON_RIGHT" = "" ]; then
+        POWERLINE_GIT_INFO_LEFT=" %F{blue}%K{white}"$'\ue0b0'"%F{white}%F{black}%K{white}"$'$(git_prompt_info)$(git_prompt_status)%F{white}'
+        POWERLINE_GIT_INFO_RIGHT=""
+    else
+        POWERLINE_GIT_INFO_LEFT=""
+        POWERLINE_GIT_INFO_RIGHT="%F{white}"$'\ue0b2'"%F{black}%K{white}"$'$(git_prompt_info)'" %K{white}"
+    fi
 fi
 
 POWERLINE_COLOR_BG_GRAY=%K{240}
-POWERLINE_COLOR_BG_LIGHT_GRAY=%K{240}
 POWERLINE_COLOR_BG_WHITE=%K{255}
 
 POWERLINE_COLOR_FG_GRAY=%F{240}
-POWERLINE_COLOR_FG_LIGHT_GRAY=%F{240}
 POWERLINE_COLOR_FG_WHITE=%F{255}
 
-GIT_DIRTY_COLOR=%F{133}
-GIT_CLEAN_COLOR=%F{118}
-GIT_PROMPT_INFO=%F{012}
-
-ZSH_THEME_GIT_PROMPT_PREFIX=" \ue0a0 "
-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="%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"
-
 if [ $(id -u) -eq 0 ]; then
     POWERLINE_SEC1_BG=%K{red}
     POWERLINE_SEC1_FG=%F{red}
@@ -60,11 +97,11 @@ if [ "$POWERLINE_DETECT_SSH" != "" ]; then
     POWERLINE_SEC1_TXT=%F{white}
   fi
 fi
-PROMPT="$POWERLINE_SEC1_BG$POWERLINE_SEC1_TXT %n %k%f$POWERLINE_SEC1_FG%K{blue}"$'\ue0b0'"%k%f%F{white}%K{blue} "$POWERLINE_CURRENT_PATH" "$POWERLINE_GIT_INFO_LEFT"%k%f%F{blue}"$'\ue0b0'"%f "
+PROMPT="$POWERLINE_SEC1_BG$POWERLINE_SEC1_TXT $POWERLINE_USER_NAME %k%f$POWERLINE_SEC1_FG%K{blue}"$'\ue0b0'"%k%f%F{white}%K{blue} "$POWERLINE_CURRENT_PATH"%F{blue}"$POWERLINE_GIT_INFO_LEFT" %k"$'\ue0b0'"%f "
 
 if [ "$POWERLINE_NO_BLANK_LINE" = "" ]; then
     PROMPT="
 "$PROMPT
 fi
 
-RPROMPT=$POWERLINE_GIT_INFO_RIGHT$POWERLINE_COLOR_FG_WHITE$'\ue0b2'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\ue0b2'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k"
+RPROMPT="$POWERLINE_GIT_INFO_RIGHT%F{yellow}"$'\ue0b2'"%k%F{black}%K{yellow} $POWERLINE_RIGHT %f%k"