diff --git a/functions/keyboard.zsh b/functions/keyboard.zsh
index e80c1233..096c768b 100644
--- a/functions/keyboard.zsh
+++ b/functions/keyboard.zsh
@@ -1,3 +1,7 @@
+# The default styles.
+zstyle ':prompt:' vicmd '<<<'         # Indicator to notify of vi command mode.
+zstyle ':prompt:' completion "..."    # Indicator to notify of generating completion.
+
 # Beep on error in line editor.
 setopt beep
 
@@ -84,14 +88,11 @@ elif [[ "$KEYMAP" == 'vi' ]]; then
   # Use vi key bindings.
   bindkey -v
 
-  # The default mode indicator.
-  MODE_INDICATOR="%B%F{red}❮%f%b%F{red}❮❮%f"
-
   # Display the current vi mode (command).
   function zle-keymap-select {
     if [[ "$KEYMAP" == 'vicmd' ]]; then
       RPROMPT_CACHED="$RPROMPT"
-      RPROMPT="$MODE_INDICATOR"
+      zstyle -s ':prompt:' vicmd RPROMPT
     elif (( $+RPROMPT_CACHED )); then
       RPROMPT="$RPROMPT_CACHED"
       unset RPROMPT_CACHED
@@ -231,7 +232,9 @@ fi
 # Display an indicator when completing.
 if check-bool "$COMPLETION_INDICATOR"; then
   function expand-or-complete-prefix-with-indicator() {
-    echo -n "\e[31m...\e[0m"
+    zstyle -s ':prompt:' completion indicator
+    print -Pn "$indicator"
+    unset indicator
     zle expand-or-complete-prefix
     zle redisplay
   }
diff --git a/themes/sorin/prompt_sorin_setup b/themes/sorin/prompt_sorin_setup
index bc1bb4d0..885a2fcf 100644
--- a/themes/sorin/prompt_sorin_setup
+++ b/themes/sorin/prompt_sorin_setup
@@ -2,7 +2,7 @@
 #          FILE:  prompt_sorin_setup
 #   DESCRIPTION:  oh-my-zsh theme file.
 #        AUTHOR:  Sorin Ionescu <sorin.ionescu@gmail.com>
-#       VERSION:  1.0.5
+#       VERSION:  1.0.6
 #    SCREENSHOT:  http://i.imgur.com/aipDQ.png
 # ------------------------------------------------------------------------------
 function prompt_sorin_precmd () {
@@ -20,7 +20,8 @@ function prompt_sorin_setup() {
   autoload -Uz add-zsh-hook
   add-zsh-hook precmd prompt_sorin_precmd
 
-  MODE_INDICATOR="%B%F{red}❮%f%b%F{red}❮❮%f"
+  zstyle ':prompt:' vicmd '%F{yellow}❮%f%B%F{red}❮%f%b%F{red}❮%f'
+  zstyle ':prompt:' completion '%B%F{red}...%f%b'
   zstyle ':git-info:' action ':%%B%F{yellow}%s%f%%b'
   zstyle ':git-info:' added ' %%B%F{green}✚%f%%b'
   zstyle ':git-info:' ahead ' %%B%F{yellow}⬆%f%%b'