diff --git a/themes/pete/pete.theme.bash b/themes/pete/pete.theme.bash
index 3186d9b7..1f9b4fc9 100644
--- a/themes/pete/pete.theme.bash
+++ b/themes/pete/pete.theme.bash
@@ -1,7 +1,16 @@
 #!/bin/bash
 
-# prompt themeing
-PROMPT="(\t) \$(prompt_char) [\[$blue\]\u\[$normal_color\]@\[$green\]\h\[$reset_color\]] \[$yellow\]\w\[$reset_color\]\$(git_prompt_info)\$(rvm_version_prompt) \$\[$reset_color\] "
+prompt_setter() {
+  # Save history
+  history -a
+  history -c
+  history -r
+  PS1="(\t) $(prompt_char) [\[$blue\]\u\[$reset_color\]@\[$green\]\H\[$reset_color\]] \[$yellow\]\w\[$reset_color\]$(git_prompt_info)$(rvm_version_prompt) $\[$reset_color\] "
+  PS2='> '
+  PS4='+ '
+}
+
+PROMPT_COMMAND=prompt_setter
 
 GIT_THEME_PROMPT_DIRTY=" ✗"
 GIT_THEME_PROMPT_CLEAN=" ✓"