diff --git a/themes/ebouchut.zsh-theme b/themes/ebouchut.zsh-theme
index 8cfec7b71..9058e07b6 100644
--- a/themes/ebouchut.zsh-theme
+++ b/themes/ebouchut.zsh-theme
@@ -10,7 +10,7 @@
 # author: Eric Bouchut
 
 ZSH_THEME_GIT_PROMPT_PREFIX="±‹%{$fg_bold[yellow]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}›"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}› "
 
 # clean_or_dirty
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗%{$reset_color%}"
@@ -28,15 +28,15 @@ ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[green]%}✭%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_bold[red]%}(!)%{$reset_color%}"
 
 # short_sha
-ZSH_THEME_GIT_PROMPT_SHA_BEFORE="%{$reset_color%}["
+ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$reset_color%}["
 ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}]"
 
 local username="%{$fg_bold[green]%}%n%{$reset_color%}"
 local hostname="%{$fg_bold[magenta]%}%m%{$reset_color%}"
-local current_dir="$fg_bold[blue]%}%~%{$reset_color%}"
+local current_dir="%{$fg_bold[blue]%}%~%{$reset_color%}"
 
 # Left prompt: username@hostname:current_directory%  
 PROMPT='$username@$hostname:$current_dir%# '
 
 # Right prompt when in a git repo:  ±‹branch_name clean_or_dirty› status(ahead) [short_sha]
-RPROMPT='$(git_prompt_info) $(git_prompt_status)$(git_prompt_ahead) $(git_prompt_short_sha)'
+RPROMPT='$(git_prompt_info)$(git_prompt_status)$(git_prompt_ahead)$(git_prompt_short_sha)'