diff --git a/lib/helpers.bash b/lib/helpers.bash
index e80c8459..e8fc19ba 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -270,6 +270,8 @@ _bash-it-reload() {
       source ~/.bashrc
       ;;
   esac
+  
+  cd - &> /dev/null || return
 }
 
 _bash-it-describe ()
diff --git a/themes/candy/candy.theme.bash b/themes/candy/candy.theme.bash
index f3f0abfc..60bde3cd 100644
--- a/themes/candy/candy.theme.bash
+++ b/themes/candy/candy.theme.bash
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 function prompt_command() {
-    PS1="${green}\u@\h $(clock_prompt) ${reset_color}${white}\w${reset_color}$(scm_prompt_info)${blue} →${bold_blue} ${reset_color} ";
+    PS1="${green}\u@\h $(clock_prompt) ${reset_color}${white}\w${reset_color}$(scm_prompt_info)${blue} →${bold_blue} ${reset_color} ${normal}";
 }
 
 THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$blue"}
diff --git a/themes/elixr/elixr.theme.bash b/themes/elixr/elixr.theme.bash
new file mode 100644
index 00000000..0e37f94c
--- /dev/null
+++ b/themes/elixr/elixr.theme.bash
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+SCM_THEME_PROMPT_DIRTY=" ${red}✗"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+SCM_THEME_PROMPT_PREFIX=" ${green}| "
+SCM_THEME_PROMPT_SUFFIX="${green} |"
+SCM_NONE_CHAR='◐ '
+SCM_GIT_SHOW_MINIMAL_INFO=true
+GIT_THEME_PROMPT_DIRTY=" ${red}✗"
+GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+GIT_THEME_PROMPT_PREFIX=" ${green}|"
+GIT_THEME_PROMPT_SUFFIX="${green}|"
+
+RVM_THEME_PROMPT_PREFIX="|"
+RVM_THEME_PROMPT_SUFFIX=" d|"
+
+BOLD="\[\e[1m\]"
+
+function prompt_command() {
+  PS1="\n${bold_cyan}$(scm_prompt_char_info) ${bold_cyan}\w :${reset_color}${normal}${BOLD} "
+}
+
+safe_append_prompt_command prompt_command
diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index b78f5b74..ac442f73 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -46,11 +46,13 @@ function __powerline_prompt_command {
 
   ## right prompt ##
   if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
-    LEFT_PROMPT+="${move_cursor_rightmost}"
+    # LEFT_PROMPT+="${move_cursor_rightmost}"
     for segment in $POWERLINE_RIGHT_PROMPT; do
       local info="$(__powerline_${segment}_prompt)"
       [[ -n "${info}" ]] && __powerline_right_segment "${info}"
     done
+    RIGHT_PAD=$(printf "%.s " $(seq 1 $RIGHT_PROMPT_LENGTH))
+    LEFT_PROMPT+="${RIGHT_PAD}${move_cursor_rightmost}"
     LEFT_PROMPT+="\033[${RIGHT_PROMPT_LENGTH}D"
   fi