diff --git a/themes/dst.zsh-theme b/themes/dst.zsh-theme
index 6b2f8767d..671433340 100644
--- a/themes/dst.zsh-theme
+++ b/themes/dst.zsh-theme
@@ -1,15 +1,17 @@
-
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 function prompt_char {
-	if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
+	if [ $UID -eq 0 ]; then
+		echo "%{$fg[red]%}#%{$reset_color%}"
+	else
+		echo $
+	fi
 }
 
-PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%}
-)
+PROMPT='${$(exit_code=$?; [[ $exit_code -ne 0 && $exit_code -ne 1 ]] && echo "%{$fg[red]%}FAIL%{$reset_color%}")}
 %{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info)
 $(prompt_char) '