diff --git a/themes/salt.zsh-theme b/themes/salt.zsh-theme
index 9c37866..cc0090b 100644
--- a/themes/salt.zsh-theme
+++ b/themes/salt.zsh-theme
@@ -2,12 +2,16 @@
 # Designed with Solarized Light in mind
 
 # Change PWD color if we're remoted in via SSH
-if [ $SSH_CLIENT ]; then pwd_color="red"; else pwd_color="blue"; fi
+hostname_prefix=""
+if [ $SSH_CLIENT ]; then
+	pwd_color="red"
+	hostname_prefix="%B$SHORT_HOST%b%{$fg[$pwd_color]%}:"
+else pwd_color="blue"; fi
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}[%{$fg[yellow]%}%B"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$reset_color%}]"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*"
 
 # Set our prompts up
-PROMPT='[%{$fg[$pwd_color]%}%~%{$reset_color%}]%(?::%{$fg_bold[red]%}?%{$reset_color%})%(!.%{$fg_bold[red]%}#.%{$fg[green]%}$)%{$reset_color%} '
+PROMPT='[%{$fg[$pwd_color]%}$hostname_prefix%~%{$reset_color%}]%(?::%{$fg_bold[red]%}?%{$reset_color%})%(!.%{$fg_bold[red]%}#.%{$fg[green]%}$)%{$reset_color%} '
 RPROMPT='$(git_prompt_info)'