diff --git a/themes/avlux.zsh-theme b/themes/avlux.zsh-theme
index f7750e597..fca6d927f 100644
--- a/themes/avlux.zsh-theme
+++ b/themes/avlux.zsh-theme
@@ -1,4 +1,4 @@
-# hybrid of wezm+ and gnzh (which is "based on bira") themes
+# based on gnzh, which is "based on bira", add svn support, show git status, color tweaks
 
 # load some modules
 autoload -U colors zsh/terminfo # Used in the colour alias below
@@ -11,41 +11,57 @@ for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
 done
 eval PR_NO_COLOR="%{$terminfo[sgr0]%}"
 eval PR_BOLD="%{$terminfo[bold]%}"
+eval PR_USER='${PR_CYAN}%n${PR_NO_COLOR}'
 
-# Check if we are on SSH or not
-if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then 
-  eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH - remote
-else
-  eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH - local
-fi
-
-PR_USER='${PR_CYAN}%n${PR_NO_COLOR}'
-
-# See if we are root or not
+# Check the UID
 if [[ $UID -ge 10 ]]; then # normal user
   eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}'
-  local PR_PROMPT='$PR_YELLOW%%$PR_NO_COLOR'
+  local PR_PROMPT='$PR_NO_COLOR%%$PR_NO_COLOR'
 elif [[ $UID -eq 0 ]]; then # root
   eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}'
   local PR_PROMPT='$PR_RED#$PR_NO_COLOR'
 fi
 
-# Current Ruby
-local rvm_ruby=''
-if which rvm-prompt &> /dev/null; then
-  rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
-elif which rbenv &> /dev/null; then
-  rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
+# Check if we are on SSH or not
+if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then 
+  eval PR_HOST='${PR_MAGENTA}%M${PR_NO_COLOR}' #SSH
+else
+  eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH
 fi
 
-local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
-local current_dir='%{$PR_GREEN%}%~%{$PR_NO_COLOR%}'
 local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
+local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
+local current_dir='%{$PR_BOLD$PR_GREEN%}%~%{$PR_NO_COLOR%}'
+local rvm_ruby=''
+if which rvm-prompt &> /dev/null; then
+  rvm_ruby='%{$PR_RED%}<$(rvm-prompt i v g s)>%{$PR_NO_COLOR%}'
+else
+  if which rbenv &> /dev/null; then
+    rvm_ruby='%{$PR_RED%}<$(rbenv version | sed -e "s/ (set.*$//")>%{$PR_NO_COLOR%}'
+  fi
+fi
+local svn_info='$(svn_prompt_info)%{$PR_NO_COLOR%}'
+local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
+local git_status='$(git_prompt_status)%{$PR_NO_COLOR%}'
 
-PROMPT="$PR_USER@$PR_HOST${rvm_ruby}$git_branch $PR_PROMPT "
-RPROMPT="$current_dir"
+#PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}$PR_PROMPT "
+PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${svn_info}${git_branch}${git_status}
+╰─>$PR_PROMPT "
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}git:"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}✓%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}+%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[magenta]%}Δ%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}>%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%}#%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[yellow]%}?%{$reset_color%}"
+
+ZSH_THEME_SVN_PROMPT_PREFIX="%{$fg[yellow]%}svn:"
+ZSH_THEME_SVN_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%}✗%{$reset_color%}"
+ZSH_THEME_SVN_PROMPT_CLEAN="%{$fg[green]%}✓%{$reset_color%}"
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}("
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}✗%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"