diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index a0a48960..e8744e61 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,11 +1,8 @@
-# load RVM
-[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
-
 # get the name of the ruby version
 function rvm_prompt_info() {
   [ -f $HOME/.rvm/bin/rvm-prompt ] || return
   local rvm_prompt
   rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
   [[ "${rvm_prompt}x" == "x" ]] && return
-  echo "$ZSH_THEME_RVM_PROMPT_PREFIX$rvm_prompt$ZSH_THEME_RVM_PROMPT_SUFFIX"
+  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index 01f381c4..fb4d32e2 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -95,7 +95,6 @@ setprompt () {
     # Modify RVM prompt
     ZSH_THEME_RVM_PROMPT_PREFIX=" ["
     ZSH_THEME_RVM_PROMPT_SUFFIX="]"
-    ZSH_THEME_RVM_PROMPT_OPTIONS=(v i)
 
 
 ###