diff --git a/lib/powerline/gate b/lib/powerline/gate
new file mode 100644
index 000000000..ee6ff7bb8
--- /dev/null
+++ b/lib/powerline/gate
@@ -0,0 +1,6 @@
+colours=(252 29 152 32)
+prompt_context_user_fg="${colours[1]}"
+prompt_context_user_bg="${colours[2]}"
+prompt_context_root_fg="${colours[3]}"
+prompt_context_root_bg="${colours[4]}"
+
diff --git a/themes/powerline-with-hostname.zsh-theme b/themes/powerline-with-hostname.zsh-theme
index 51e228302..41574afc3 100644
--- a/themes/powerline-with-hostname.zsh-theme
+++ b/themes/powerline-with-hostname.zsh-theme
@@ -1,5 +1,4 @@
-# zshrc
-# vim: ts=2 sw=2 sts=2 et
+# vim:ft=zsh ts=2 sw=2 sts=2
 #
 # powerline theme - based on agnoster's theme - https://gist.github.com/3712874
 #
@@ -187,30 +186,15 @@ build_prompt() {
   prompt_end
 }
 
-## right prompt
+## right prompt (fixed)
 build_rprompt() {
   RETVAL=$?
-  FOO="$!"
   local symbols
   symbols=()
   drawrightprompt=0
   [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙" && drawrightprompt=1
   [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡" && drawrightprompt=1
-  if [[ $ZLE_LINE_ABORTED ]]; then
-  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%} ✘ " && drawrightprompt=1
-  else
-    lastchars=8
-    last="$(fc -nl -1 | cut -b -${lastchars})..."
-  
-    if [[ "${#last}" -gt "$lastchars" ]]; then
-      last="$(fc -nl -1 | cut -b -${lastchars})..."
-    else
-      last="$(fc -nl -1 | cut -b -${lastchars})"
-    fi
-
-#   [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%} ✘ $RETVAL $(fc -nl -1 | cut -b -8)..." && drawrightprompt=1
-  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%} ✘" && drawrightprompt=1
-  fi
+  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘ $RETVAL" && drawrightprompt=1
   if [[ "$drawrightprompt" -eq 1 ]]; then
 		prompt_rseperator %k 238
   fi