diff --git a/themes/gentoo-olipro.zsh-theme b/themes/gentoo-olipro.zsh-theme
index a992da34e..35c4b7e09 100644
--- a/themes/gentoo-olipro.zsh-theme
+++ b/themes/gentoo-olipro.zsh-theme
@@ -9,13 +9,17 @@ zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
 zstyle ':vcs_info:*' enable git svn
 theme_precmd () {
     if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
-    	if [[ -z $(git status --porcelain --untracked-files=no 2> /dev/null) ]] {
-		zstyle ':vcs_info:*' formats ' (%b) %c%u%B%F{blue}'
-	} else {
-		zstyle ':vcs_info:*' formats ' (%b) %c%u%B%F{blue} '
-	}
+        if [[ -z $(git status --porcelain --untracked-files=no 2> /dev/null) ]] {
+                        zstyle ':vcs_info:*' formats ' (%b)%c%u%B%F{blue}'
+        } else {
+                if [[ -z %u ]] {
+                        zstyle ':vcs_info:*' formats ' (%b)%c%u%B%F{blue}'
+                } else {
+                        zstyle ':vcs_info:*' formats ' (%b) %c%u%B%F{blue}'
+                }
+        }
     } else {
-        zstyle ':vcs_info:*' formats ' (%b) %c%u%B%F{red}●%F{blue} '
+        zstyle ':vcs_info:*' formats ' (%b) %c%u%B%F{red}[34m~W~O%F{blue}'
     }
 
     vcs_info
@@ -23,6 +27,6 @@ theme_precmd () {
 
 setopt prompt_subst
 #PROMPT='%B%F{magenta}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}%% '
-	PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~)${vcs_info_msg_0_}%#%{$reset_color%} '
+	PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~)${vcs_info_msg_0_} %#%{$reset_color%} '
 autoload -U add-zsh-hook
 add-zsh-hook precmd  theme_precmd