diff --git a/themes/adamransom.zsh-theme b/themes/adamransom.zsh-theme
index 9200a821a..8acd4b4d4 100644
--- a/themes/adamransom.zsh-theme
+++ b/themes/adamransom.zsh-theme
@@ -5,18 +5,22 @@ function _prompt_char() {
 }
 
 function _ssh_prompt() {
-  [[ -n "${SSH_CONNECTION}" ]] && "%n%{$fg_bold[blue]%}@%{$fg_bold[cyan]%}%m%{$fg_bold[green]%}"
+  [[ -n "${SSH_CONNECTION}" ]] && "%{$fg_bold[green]%}%n%{$fg_bold[blue]%}@%{$fg_bold[cyan]%}%m%{$fg_bold[green]%}"
 }
 
 function _collapse_pwd {
   echo $(pwd | sed -e "s,^$HOME,~,")
 }
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg_bold[blue]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$bg[black]%}%{$fg_bold[green]%}"
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$reset_color%}%{$bg[black]%}%{$fg[red]%}✘%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=" %{$reset_color%}%{$bg[black]%}%{$fg[green]%}✔%{$reset_color%}"
+precmd()
+{
+  print -rP '
+$(_ssh_prompt)%{$fg[yellow]%}$(_collapse_pwd)$(git_prompt_info)%{$reset_color%}'
+}
 
-PROMPT='%{$reset_color%}
-%{%K{black}%B%F{green}%}$(_ssh_prompt)%{%b%F{yellow}%K{black}%}$(_collapse_pwd)%{%B%F{green}%}$(git_prompt_info)%E%{$reset_color%}
-%{%K{black}%}$(_prompt_char)%{%K{black}%} %#%{$reset_color%} '
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg_bold[green]%}on %{$fg_bold[blue]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$reset_color%}%{$fg[red]%}✘%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$reset_color%}%{$fg[green]%}✔%{$reset_color%}"
+
+PROMPT='$(_prompt_char) %#%{$reset_color%} '