diff --git a/ivabus.zsh-theme b/ivabus.zsh-theme
index 397459f..ba05820 100644
--- a/ivabus.zsh-theme
+++ b/ivabus.zsh-theme
@@ -1,25 +1,30 @@
 # ivabus zsh prompt theme
 __zsh_prompt() {
-    local prompt_username
-    prompt_username="%n"
-    local prompt_hostname
-    prompt_hostname="%m"
-    if [[ $UID == 0 || $EUID == 0 ]]; then
-        PROMPT="%{$fg[red]%}${prompt_username}%{$reset_color%}@%{$fg[red]%}${prompt_hostname} %(?:%{$reset_color%}➜ :%{$fg_bold[red]%}➜ )"
-    else
-        PROMPT="%{$fg[green]%}${prompt_username}%{$reset_color%}@%{$fg[cyan]%}${prompt_hostname} %(?:%{$reset_color%}➜ :%{$fg_bold[red]%}➜ )" # User/exit code arrow
-    fi
-    PROMPT+='%{$fg_bold[blue]%}%(5~|%-1~/…/%3~|%4~)%{$reset_color%} ' # cwd
-    PROMPT+='$(git_prompt_info)' # Git status
-    if [[ $UID == 0 || $EUID == 0 ]]; then
-        PROMPT+='%{$fg[red]%}# %{$reset_color%}'
-    else
-        PROMPT+='%{$fg[white]%}$ %{$reset_color%}'
-    fi
-    unset -f __zsh_prompt
+  # set basic prompt with "USERNAME@HOSTNAME "
+  if [[ $UID == 0 || $EUID == 0 ]]; then
+    PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[red]%}%m "
+  else
+    PROMPT="%{$fg[green]%}%n%{$reset_color%}@%{$fg[cyan]%}%m "
+  fi
+  # add to current prompt arrow or [exitcode] if non 0
+  PROMPT+='%(?:%{$reset_color%}➜ :%{$fg_bold[red]%}%(?..[%?]) )'
+  # add current working directory
+  PROMPT+='%{$fg_bold[blue]%}%(5~|%-1~/…/%3~|%4~)%{$reset_color%} '
+  # and git status
+  PROMPT+='$(git_prompt_info)'
+  # add $ or #
+  if [[ $UID == 0 || $EUID == 0 ]]; then
+    PROMPT+='%{$fg[red]%}# %{$reset_color%}'
+  else
+    PROMPT+='%{$fg[white]%}$ %{$reset_color%}'
+  fi
+  unset -f __zsh_prompt
 }
+
+# setup git status
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[cyan]%}(%{$fg_bold[red]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%}"
 __zsh_prompt
+
diff --git a/screenshot.png b/screenshot.png
index 2e2ca04..20447b6 100644
Binary files a/screenshot.png and b/screenshot.png differ