diff --git a/themes/wuffers.zsh-theme b/themes/wuffers.zsh-theme
index 004b5ebc..182d8a34 100644
--- a/themes/wuffers.zsh-theme
+++ b/themes/wuffers.zsh-theme
@@ -1,5 +1,5 @@
-ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[blue]["
-ZSH_THEME_GIT_PROMPT_SUFFIX="]$reset_color "
-ZSH_THEME_GIT_PROMPT_DIRTY="$fg_bold[red] x$fg_bold[blue]"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} x%{$fg_bold[blue]%}"
 
-PROMPT='$(git_prompt_info)$fg_bold[green]{$(rvm current)}$reset_color $fg[cyan]%c$reset_color '
+PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current)%}}%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} '