diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..0a81941f2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "plugins/zsh-syntax-highlighting"]
+	path = plugins/zsh-syntax-highlighting
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index aec67721a..92ccd1c1d 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -1,6 +1,6 @@
 # ls colors
 autoload colors; colors;
-export LSCOLORS="Gxfxcxdxbxegedabagacad"
+#export LSCOLORS="Gxfxcxdxbxegedabagacad"
 #export LS_COLORS
 
 # Enable ls colors
diff --git a/plugins/ls_colors b/plugins/ls_colors
new file mode 160000
index 000000000..093797575
--- /dev/null
+++ b/plugins/ls_colors
@@ -0,0 +1 @@
+Subproject commit 0937975751f0a957228c3fbb4d6b4a181d40f073
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index e2cf96ca3..89b00dd4b 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,22 +1,22 @@
 function svn_prompt_info {
     if [ $(in_svn) ]; then
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+$ZSH_THEME_REPO_NAME_COLOR$(svn_get_branch_name):$(svn_get_rev_nr)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
     fi
 }
 
 
 function in_svn() {
-    if [[ -d .svn ]]; then
+    info=$(svn info 2> /dev/null) || return
+    if [ $info ]; then
         echo 1
     fi
 }
 
-function svn_get_repo_name {
+function svn_get_branch_name {
     if [ $(in_svn) ]; then
-        svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
-    
-        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
+      svn info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
+      echo $SVN_URL
     fi
 }
 
diff --git a/plugins/zsh-syntax-highlighting b/plugins/zsh-syntax-highlighting
new file mode 160000
index 000000000..bb0d57594
--- /dev/null
+++ b/plugins/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit bb0d575942760fe483790fe878ea43b1f781e2ca
diff --git a/themes/maran.zsh-theme b/themes/maran.zsh-theme
index 6fba04688..cc66770ef 100644
--- a/themes/maran.zsh-theme
+++ b/themes/maran.zsh-theme
@@ -1,6 +1,11 @@
 # Theme with full path names and hostname
 # Handy if you work on different servers all the time;
-PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%} $(git_prompt_info) %(!.#.$) '
+PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%}%{$fg[cyan]%}$(svn_prompt_info)%{$reset_color%}$(git_prompt_info)%(!.#.%{$fg[yellow]%}$%{$reset_color%}) '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}git:("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
+
+ZSH_THEME_SVN_PROMPT_PREFIX=" svn:("
+ZSH_THEME_SVN_PROMPT_SUFFIX=")"
+ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%}!%{$reset_color%}"
+ZSH_THEME_SVN_PROMPT_CLEAN=""