diff --git a/themes/brethil.zsh-theme b/themes/brethil.zsh-theme
index 3559112..366a000 100644
--- a/themes/brethil.zsh-theme
+++ b/themes/brethil.zsh-theme
@@ -126,7 +126,7 @@ function ret_status() {
 
 export MODE_INDICATOR="%F{255}[%F{9}nav%F{255}]%f"
 
-_PROMPT_PROTO='$(vi_mode_prompt_info)$(virtualenv_info)$(user_prompt)$(path_prompt)$(git_prompt)$(job_prompt)$(shlvl_prompt)'
+_PROMPT_PROTO='$(virtualenv_info)$(user_prompt)$(path_prompt)$(git_prompt)$(job_prompt)$(shlvl_prompt)'
 
 function prompt_too_long(){
   local zero='%([BSUbfksu]|([FK]|){*})'
@@ -155,4 +155,4 @@ PROMPT+='${$(prompt_too_long)/true/${NEWLINE}}'
 PROMPT+='$(ret_status) '
 
 # Right prompt is just return code and time
-RPS1='$(return_code_RPS1) %F{255}[%*]%f'
+RPS1='$(return_code_RPS1)$(vi_mode_prompt_info)%F{255}[%*]%f'