diff --git a/themes/kaffeefleck.zsh-theme b/themes/kaffeefleck.zsh-theme
index 2c1d8a2ea..54e12db84 100644
--- a/themes/kaffeefleck.zsh-theme
+++ b/themes/kaffeefleck.zsh-theme
@@ -6,7 +6,7 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
 local directory="%{$fg[cyan]%}%1~%{$reset_color%}"
 local left_delimiter="%{$fg[red]%}|%{$reset_color%}"
 local right_delimiter=" %{$fg[cyan]%}⇒%{$reset_color%} "
-if [ $UID -eq 0 ]; then 
+if [[ "$ZSH_THEME_PREFIX_ROOT" != "" && "$UID" -eq 0 ]]; then 
     local root_prefix="%{$fg[red]%}♚ %{$reset_color%}"
 else
     local root_prefix=""
@@ -14,5 +14,7 @@ fi
 
 PROMPT='${root_prefix}${directory}${left_delimiter}$(git_prompt_info)${right_delimiter}'
 
-local return_code="%(?..%{$fg[red]%}%?%{$reset_color%})"
-RPROMPT='${return_code}'
+if [ "$ZSH_THEME_USE_RPROMPT" != "" ]; then
+    local return_code="%(?..%{$fg[red]%}%?%{$reset_color%})"
+    RPROMPT='${return_code}'
+fi