diff --git a/keyboard.zsh b/keyboard.zsh
index 50c9001d..04a46ab4 100644
--- a/keyboard.zsh
+++ b/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,9 +88,6 @@ elif [[ "$KEYMAP" == 'vi' ]]; then
   # Use vi key bindings.
   bindkey -v
 
-  # The default mode indicator.
-  MODE_INDICATOR="%B%F{red}❮%f%b%F{red}❮❮%f"
-
   # Restores RPROMPT when exiting vicmd.
   function vi-restore-rprompt() {
     if (( $+RPROMPT_CACHED )); then
@@ -103,7 +104,7 @@ elif [[ "$KEYMAP" == 'vi' ]]; then
   function zle-keymap-select() {
     if ! vi-restore-rprompt && [[ "$KEYMAP" == 'vicmd' ]]; then
       RPROMPT_CACHED="$RPROMPT"
-      RPROMPT="$MODE_INDICATOR"
+      zstyle -s ':prompt:' vicmd RPROMPT
       zle reset-prompt
     fi
   }
@@ -249,7 +250,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 e254a948..dbd685ef 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,19 +20,20 @@ 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'
   zstyle ':git-info:' behind ' %%B%F{yellow}⬇%f%%b'
   zstyle ':git-info:' branch ':%F{red}%b%f'
   zstyle ':git-info:' deleted ' %%B%F{red}✖%f%%b'
-  zstyle ':git-info:' modified ' %%B%F{blue}✹%f%%b'
+  zstyle ':git-info:' modified ' %%B%F{blue}✱%f%%b'
   zstyle ':git-info:' renamed ' %%B%F{magenta}➜%f%%b'
   zstyle ':git-info:' commit '%c'
-  zstyle ':git-info:' stashed ' %%B%F{white}✭%f%%b'
+  zstyle ':git-info:' stashed ' %%B%F{cyan}✭%f%%b'
   zstyle ':git-info:' unmerged ' %%B%F{yellow}═%f%%b'
-  zstyle ':git-info:' untracked ' %%B%F{cyan}•%f%%b'
+  zstyle ':git-info:' untracked ' %%B%F{white}◼%f%%b'
   zstyle ':git-info:' prompt ' %F{blue}git%f%b%s'
   zstyle ':git-info:' rprompt '%A%B%S%a%d%m%r%U%u'