diff --git a/themes/jtzemp.zsh-theme b/themes/jtzemp.zsh-theme
index 21542a89c..4a994c29a 100644
--- a/themes/jtzemp.zsh-theme
+++ b/themes/jtzemp.zsh-theme
@@ -3,8 +3,8 @@
 # Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
 JTZEMP_CURRENT_TIME_="%{$fg[blue]%}[%{$fg[red]%}%T%{$fg[blue]%}]%{$reset_color%}"
 
-# Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
-JTZEMP_CURRENT_RUBY_="%{$fg[blue]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt s i v)%{$fg[blue]%}]%{$reset_color%}"
+# Grab the current version of ruby in use (via RVM): [ruby-1.8.7@rails2]
+JTZEMP_CURRENT_RUBY_="%{$fg[blue]%}[%{$fg[red]%}\$(rvm_with_gemset)%{$fg[blue]%}]%{$reset_color%}"
 
 # Grab the current machine name: muscato
 JTZEMP_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
@@ -13,7 +13,7 @@ JTZEMP_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
 # Append the current git branch, if in a git repository: ~aw@master
 JTZEMP_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
 
-# Grab the current username: dallas
+# Grab the current username
 JTZEMP_CURRENT_USER_="%{$fg[green]%}%n@%{$reset_color%}"
 
 # Use a % for normal users and a # for privelaged (root) users.
@@ -30,7 +30,6 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 # Add 3 red ✗s if this branch is diiirrrty! Dirty branch!
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ✗✗✗"
-#ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} !"
 
 
 # Put it all together!