diff --git a/.zshrc b/.zshrc
index c639e9f..ad85424 100644
--- a/.zshrc
+++ b/.zshrc
@@ -53,14 +53,15 @@ add-zsh-hook precmd precmd_maybe_festival
 add-zsh-hook precmd vcs_info
 add-zsh-hook chpwd chpwd_update_git_vars
 
-zstyle ':vcs_info:*' actionformats '%B%F{5}%a%f%%b %s:%r-%b %S'
+zstyle ':vcs_info:*' actionformats '%B%F{1}%a%f%%b (%F{3}%s%f) %F{5}%r%f:%F{4}%b%f %F{2}%S%f'
 zstyle ':vcs_info:*' enable bzr git hg svn
-zstyle ':vcs_info:*' formats '%s:%r-%b %S'
-zstyle ':vcs_info:*' nvcsformats '%~'
+zstyle ':vcs_info:*' formats '(%F{3}%s%f) %F{5}%r%f:%F{4}%b%f %F{2}%S%f'
+zstyle ':vcs_info:*' nvcsformats '%F{2}%~%f'
 zstyle ':vcs_info:bzr:*' branchformat '%b'
 
 # Set the prompt.
-PROMPT='%B%(?.%F{2}+.%F{1}-) %F{6}%m%b%f ${vcs_info_msg_0_} %# '
+PROMPT='${vcs_info_msg_0_}
+%B%F{6}%m%b%f %B%(?.%F{2}+.%F{1}-)%b> '
 
 # Set terminal name to current running application
 case $TERM in