diff --git a/themes/pixelmuerto.zsh-theme b/themes/pixelmuerto.zsh-theme
index 175113e89..7637286d9 100644
--- a/themes/pixelmuerto.zsh-theme
+++ b/themes/pixelmuerto.zsh-theme
@@ -6,8 +6,8 @@ autoload -Uz vcs_info
 local localDate='%{$fg[white]%}$(date +%H:%M)%{$reset_color%}'
 local userHost= #'[%n@%m] '
 
-zstyle ':vcs_info:*' stagedstr '%F{green}●'
-zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
+zstyle ':vcs_info:*' stagedstr '%F{green}+'
+zstyle ':vcs_info:*' unstagedstr '%F{yellow}*'
 zstyle ':vcs_info:*' check-for-changes true
 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
 zstyle ':vcs_info:*' enable git svn
@@ -17,7 +17,7 @@ function git_remotes() {
   remotes=""
   if [[ -d .git ]]; then
 	  if [[ $(git branch | awk '{ print $2}') == "master" ]]; then
-  			git_dir="$PWD/.git"
+  			git_dir=$(git rev-parse --git-dir)
 	        fetchUpdate=3600 
 	        remotes=()
 	        for remote in $(git remote)
@@ -51,14 +51,14 @@ local remotes='%B%F{blue}$(git_remotes)%{$reset_color%}'
 
 precmd () {
     if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{white}]'
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
     } else {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{white}]'
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}?%F{green}]'
     }
 
     vcs_info
 }
 
 setopt prompt_subst
-PROMPT='%B%F{white}${userHost}%~%B%F{white}${vcs_info_msg_0_}%B%F{magenta}%{$reset_color%}$ '
+PROMPT='%B%F{white}${userHost}%~%B%F{green}${vcs_info_msg_0_}%B%F{magenta}%{$reset_color%}$ '
 RPROMPT="${remotes} ${localDate}"