diff --git a/plugins/available/chruby-auto.bash b/plugins/available/chruby-auto.plugin.bash
similarity index 100%
rename from plugins/available/chruby-auto.bash
rename to plugins/available/chruby-auto.plugin.bash
diff --git a/plugins/available/chruby.bash b/plugins/available/chruby.plugin.bash
similarity index 100%
rename from plugins/available/chruby.bash
rename to plugins/available/chruby.plugin.bash
diff --git a/plugins/available/virtualenv.plugin.bash b/plugins/available/virtualenv.plugin.bash
index 9357839..651bfec 100644
--- a/plugins/available/virtualenv.plugin.bash
+++ b/plugins/available/virtualenv.plugin.bash
@@ -19,14 +19,14 @@
   about 'create a new virtualenv for the current branch'
   group 'virtualenv'
 
-  mkvirtualenv --distribute "$(basename `pwd`)@$(git_prompt_info)"
+  mkvirtualenv --distribute "$(basename `pwd`)@$SCM_BRANCH"
 }
 
 function wovbranch {
   about 'sets workon branch'
   group 'virtualenv'
 
-  workon "$(basename `pwd`)@$(git_prompt_info)"
+  workon "$(basename `pwd`)@$SCM_BRANCH"
 }
 
 function wovenv {
diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index d616927..9c5bedb 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -132,6 +132,7 @@
 function rbenv_version_prompt {
   if which rbenv &> /dev/null; then
     rbenv=$(rbenv version-name) || return
+    $(rbenv commands | grep -q gemset) && gemset=$(rbenv gemset active) && rbenv="$rbenv@${gemset%% *}"
     echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
   fi
 }