diff --git a/powerline.zsh-theme b/powerline.zsh-theme
index da6400f..a65797f 100644
--- a/powerline.zsh-theme
+++ b/powerline.zsh-theme
@@ -12,6 +12,13 @@ if [ "$POWERLINE_CURRENT_PATH" = "" ]; then
   POWERLINE_CURRENT_PATH="%1~"
 fi
 
+POWERLINE_GIT_INFO_LEFT=""
+POWERLINE_GIT_INFO_RIGHT="%F{red}"$'\u2b82'"%F{black}%K{red}"$'$(git_prompt_info)'" %f"
+if [ "$POWERLINE_SHOW_GIT_ON_RIGHT" = "" ]; then
+    POWERLINE_GIT_INFO_LEFT=$'$(git_prompt_info)'
+    POWERLINE_GIT_INFO_RIGHT=""
+fi
+
 POWERLINE_COLOR_BG_GRAY=%K{240}
 POWERLINE_COLOR_BG_LIGHT_GRAY=%K{240}
 POWERLINE_COLOR_BG_WHITE=%K{255}
@@ -36,12 +43,11 @@ 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} "$POWERLINE_CURRENT_PATH" %k%f%F{blue}"$'\u2b80'"%f "
-#"%k%f%F{black}%K{yellow}"$'$(git_prompt_info)'" %k%f%F{yellow}"$'\u2b80'"%f "
+PROMPT="%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} "$POWERLINE_CURRENT_PATH" "$POWERLINE_GIT_INFO_LEFT"%k%f%F{blue}"$'\u2b80'"%f "
 
 if [ "$POWERLINE_NO_BLANK_LINE" = "" ]; then
     PROMPT="
 "$PROMPT
 fi
 
-RPROMPT="%F{red}"$'\u2b82'"%F{black}%K{red}"$'$(git_prompt_info)'" %f"$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k"
+RPROMPT=$POWERLINE_GIT_INFO_RIGHT$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k"