diff --git a/make_a_link.sh b/make_a_link.sh
new file mode 100755
index 0000000..ae89e19
--- /dev/null
+++ b/make_a_link.sh
@@ -0,0 +1 @@
+ln -f powerline.zsh-theme ~/.oh-my-zsh/themes/powerline.zsh-theme
\ No newline at end of file
diff --git a/powerline.zsh-theme b/powerline.zsh-theme
index 6ebdd1a..a65797f 100644
--- a/powerline.zsh-theme
+++ b/powerline.zsh-theme
@@ -8,6 +8,17 @@ if [ "$POWERLINE_RIGHT_A" = "" ]; then
   POWERLINE_RIGHT_A=%D{%Y-%m-%d}
 fi
 
+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}
@@ -32,7 +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} %1~"$'$(git_prompt_info)'" %k%f%F{blue}"$'\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 "
 
-RPROMPT=$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"
+if [ "$POWERLINE_NO_BLANK_LINE" = "" ]; then
+    PROMPT="
+"$PROMPT
+fi
+
+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"