diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index 597be1b33..440f77c79 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,7 +1,7 @@
 # get the name of the branch we are on
 function rvm_prompt_info() {
   ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
-  echo "($ruby_version)"
+  echo "$ruby_version"
 }
 
 
diff --git a/themes/risto.zsh-theme b/themes/risto.zsh-theme
index cb773a64e..a21f4f6f0 100644
--- a/themes/risto.zsh-theme
+++ b/themes/risto.zsh-theme
@@ -1,6 +1,15 @@
-# -*- sh -*- vim:set ft=sh ai et sw=4 sts=4:
-# It might be bash like, but I can't have my co-workers knowing I use zsh
-PROMPT='%{$fg[green]%}%n@%m:%{$fg_bold[blue]%}%2~ $(git_prompt_info)%{$reset_color%}%(!.#.$) '
+# Risto Theme
+#
+# Requires the svn plugin
+#
+PROMPT='%{$fg[green]%}%n@%m:%{$fg[blue]%}%2~ $(svn_prompt_info)$(git_prompt_info)%{$reset_color%}%(!.#.%%) '
+RPROMPT='%{$fg_bold[red]%}$(rvm_prompt_info)%{$reset_color%}%'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹"
-ZSH_THEME_GIT_PROMPT_SUFFIX="›%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[red]%}›%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}✓"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[yellow]%}∗"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_SVN_PROMPT_PREFIX="%{$fg[red]%}‹"
+ZSH_THEME_SVN_PROMPT_SUFFIX="›%{$reset_color%}"
+