diff --git a/modules/prompt/functions/prompt_sorinmod_setup b/modules/prompt/functions/prompt_sorinmod_setup
index 39e6067..8422f1a 100644
--- a/modules/prompt/functions/prompt_sorinmod_setup
+++ b/modules/prompt/functions/prompt_sorinmod_setup
@@ -157,11 +157,14 @@ function prompt_sorin_setup {
     'status' '%b %p %c:%s%A%B%S%a%d%m%r%U%u'
 
   # Set python-info parameters.
-  zstyle ':prezto:module:python:info:virtualenv' format '%f%F{3}(%v)%F{7} '
+  zstyle ':prezto:module:python:info:virtualenv' format '%f%F{3} %v%F{7} '
 
   # Set os-info parameters
   zstyle ':prezto:module:openstack:info:tenant' format '%f%F{3}[%v]%F{7}'
 
+  # Set aws-info parameters
+  zstyle ':prezto:module:aws:info:profile' format '%f%F{2}  %v%F{7}'
+
   # Set up non-zero return value display
   local show_return="✘ "
   # Default is to show the return value
@@ -177,7 +180,7 @@ function prompt_sorin_setup {
 
   # Define prompts.
   PROMPT='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%f "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} '
-  RPROMPT='${os_info:+${os_info[tenant]} }${aws_info:+${aws_info[profile]} }$python_info[virtualenv]${editor_info[overwrite]}%(?:: %F{1}'
+  RPROMPT='${aws_info:+${aws_info[profile]} }${os_info:+${os_info[tenant]} }$python_info[virtualenv]${editor_info[overwrite]}%(?:: %F{1}'
   RPROMPT+=${show_return}
   RPROMPT+='%f)${VIM:+" %B%F{6}V%f%b"}${_prompt_sorin_git}'
   SPROMPT='zsh: correct %F{1}%R%f to %F{2}%r%f [nyae]? '