diff --git a/themes/TruncatedPwd_WindowTitle.bgptheme b/themes/TruncatedPwd_WindowTitle.bgptheme
index 625d3af..1c1f5ee 100644
--- a/themes/TruncatedPwd_WindowTitle.bgptheme
+++ b/themes/TruncatedPwd_WindowTitle.bgptheme
@@ -27,13 +27,14 @@ override_git_prompt_colors() {
   function prompt_callback {
     local PS1="\u@\h: $(gp_truncate_pwd)"
     gp_set_window_title "$PS1"
-    echo -n "[${PS1}]${ResetColor}"
+    echo -n "${Yellow}[${PS1}]${ResetColor}"
   }
 
-  GIT_PROMPT_START_USER="${Yellow}"
-  GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
-  GIT_PROMPT_END_USER=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor} $ "
-  GIT_PROMPT_END_ROOT=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor} # "
+  local gp_end=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor}"
+
+  GIT_PROMPT_START_USER=""
+  GIT_PROMPT_END_USER="${gp_end} $ "
+  GIT_PROMPT_END_ROOT="${gp_end} # "
 }
 
 reload_git_prompt_colors "TruncatedPwd_WindowTitle"
diff --git a/themes/TruncatedPwd_WindowTitle_NoExitState.bgptheme b/themes/TruncatedPwd_WindowTitle_NoExitState.bgptheme
index e9a7bf6..bae8f57 100644
--- a/themes/TruncatedPwd_WindowTitle_NoExitState.bgptheme
+++ b/themes/TruncatedPwd_WindowTitle_NoExitState.bgptheme
@@ -27,13 +27,14 @@ override_git_prompt_colors() {
   function prompt_callback {
     local PS1="\u@\h: $(gp_truncate_pwd)"
     gp_set_window_title "$PS1"
-    echo -n "[${PS1}]${ResetColor}"
+    echo -n "${Yellow}[${PS1}]${ResetColor}"
   }
 
-  GIT_PROMPT_START_USER="${Yellow}"
-  GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
-  GIT_PROMPT_END_USER="\n${White}${Time12a}${ResetColor} $ "
-  GIT_PROMPT_END_ROOT="\n${White}${Time12a}${ResetColor} # "
+  local gp_end=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor}"
+
+  GIT_PROMPT_START_USER=""
+  GIT_PROMPT_END_USER="${gp_end} $ "
+  GIT_PROMPT_END_ROOT="${gp_end} # "
 }
 
 reload_git_prompt_colors "TruncatedPwd_WindowTitle_NoExitState"
diff --git a/themes/TruncatedPwd_WindowTitle_NoExitState_Ubuntu.bgptheme b/themes/TruncatedPwd_WindowTitle_NoExitState_Ubuntu.bgptheme
index 0938144..032dddc 100644
--- a/themes/TruncatedPwd_WindowTitle_NoExitState_Ubuntu.bgptheme
+++ b/themes/TruncatedPwd_WindowTitle_NoExitState_Ubuntu.bgptheme
@@ -28,13 +28,14 @@ override_git_prompt_colors() {
   function prompt_callback {
     local PS1="\u@\h: $(gp_truncate_pwd)"
     gp_set_window_title "$PS1"
-    echo -n "[${PS1}]${ResetColor}"
+    echo -n "${Yellow}[${PS1}]${ResetColor}"
   }
 
-  GIT_PROMPT_START_USER="${Yellow}"
-  GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
-  GIT_PROMPT_END_USER="\n${White}${Time12a}${ResetColor} $ "
-  GIT_PROMPT_END_ROOT="\n${White}${Time12a}${ResetColor} # "
+  local gp_end=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor}"
+
+  GIT_PROMPT_START_USER=""
+  GIT_PROMPT_END_USER="${gp_end} $ "
+  GIT_PROMPT_END_ROOT="${gp_end} # "
 
   GIT_PROMPT_STAGED="${Red}● "          # the number of staged files/directories
   GIT_PROMPT_CLEAN="${BoldGreen}✔ "     # a colored flag indicating a "clean" repo
diff --git a/themes/TruncatedPwd_WindowTitle_Ubuntu.bgptheme b/themes/TruncatedPwd_WindowTitle_Ubuntu.bgptheme
index d41f2c8..e24653a 100644
--- a/themes/TruncatedPwd_WindowTitle_Ubuntu.bgptheme
+++ b/themes/TruncatedPwd_WindowTitle_Ubuntu.bgptheme
@@ -28,13 +28,14 @@ override_git_prompt_colors() {
   function prompt_callback {
     local PS1="\u@\h: $(gp_truncate_pwd)"
     gp_set_window_title "$PS1"
-    echo -n "[${PS1}]${ResetColor}"
+    echo -n "${Yellow}[${PS1}]${ResetColor}"
   }
 
-  GIT_PROMPT_START_USER="${Yellow}"
-  GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
-  GIT_PROMPT_END_USER=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor} $ "
-  GIT_PROMPT_END_ROOT=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor} # "
+  local gp_end=" _LAST_COMMAND_INDICATOR_\n${White}${Time12a}${ResetColor}"
+
+  GIT_PROMPT_START_USER=""
+  GIT_PROMPT_END_USER="${gp_end} $ "
+  GIT_PROMPT_END_ROOT="${gp_end} # "
 
   GIT_PROMPT_STAGED="${Red}● "          # the number of staged files/directories
   GIT_PROMPT_CLEAN="${BoldGreen}✔ "     # a colored flag indicating a "clean" repo