diff --git a/README.textile b/README.textile
index 86dd5da22..cd97071d5 100644
--- a/README.textile
+++ b/README.textile
@@ -14,18 +14,18 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/davidjrobertson/oh-my-zsh/raw/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/davidjrobertson/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
 
 1. Clone the repository
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+  @git clone git://github.com/davidjrobertson/oh-my-zsh.git ~/.oh-my-zsh@
 
 2. *OPTIONAL* Backup your existing ~/.zshrc file
 
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1dfb6998c..394dbf43c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -5,11 +5,11 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="robbyrussell"
+ZSH_THEME="davidrobertson"
 
 # Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
+alias zshconfig="vim ~/.zshrc"
+alias ohmyzsh="vim ~/.oh-my-zsh"
 
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"
@@ -30,7 +30,10 @@ ZSH_THEME="robbyrussell"
 # DISABLE_CORRECTION="true"
 
 # Uncomment following line if you want red dots to be displayed while waiting for completion
-# COMPLETION_WAITING_DOTS="true"
+COMPLETION_WAITING_DOTS="true"
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+
 
 # Uncomment following line if you want to disable marking untracked files under
 # VCS as dirty. This makes repository status check for large repositories much,
@@ -40,8 +43,12 @@ ZSH_THEME="robbyrussell"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git)
-
+plugins=(git gem npm rails3 rake rvm redis-cli lol zsh-syntax-highlighting)
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets root)
 source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
+export PATH=/home/david/.rvm/gems/ruby-1.9.3-p0/bin:/home/david/.rvm/gems/ruby-1.9.3-p0@global/bin:/home/david/.rvm/rubies/ruby-1.9.3-p0/bin:/home/david/.rvm/bin:/usr/lib/lightdm/lightdm:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/home/david/.rvm/bin
+
+export EDITOR=vim
+unsetopt correctall
diff --git a/themes/davidrobertson.zsh-theme b/themes/davidrobertson.zsh-theme
new file mode 100644
index 000000000..9e428f1d6
--- /dev/null
+++ b/themes/davidrobertson.zsh-theme
@@ -0,0 +1,45 @@
+# ------------------------------------------------------------------------
+# David Robertson's oh-my-zsh theme (basically a hybrid of the default robbyrussell theme and juanghurtado theme)
+# (Needs Git plugin for current_branch method)
+# ------------------------------------------------------------------------
+
+
+# Color shortcuts
+RED=$fg[red]
+YELLOW=$fg[yellow]
+GREEN=$fg[green]
+WHITE=$fg[white]
+BLUE=$fg[blue]
+RED_BOLD=$fg_bold[red]
+YELLOW_BOLD=$fg_bold[yellow]
+GREEN_BOLD=$fg_bold[green]
+WHITE_BOLD=$fg_bold[white]
+BLUE_BOLD=$fg_bold[blue]
+RESET_COLOR=$reset_color
+
+# Format for git_prompt_info()
+ZSH_THEME_GIT_PROMPT_PREFIX=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+
+# Format for parse_git_dirty()
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}✗"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GREEN%}✓"
+
+# Format for git_prompt_status()
+ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}Unmerged"
+ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}Deleted"
+ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}Renamed"
+ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}Modified"
+ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}Added"
+ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}Untracked"
+
+# Format for git_prompt_ahead()
+ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}⇑"
+
+# Format for git_prompt_long_sha() and git_prompt_short_sha()
+ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}"
+ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
+
+# Prompt format
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
diff --git a/tools/install.sh b/tools/install.sh
index a2bd5665a..2cd2eb326 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -5,11 +5,13 @@ then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || {
+
+hash git >/dev/null && /usr/bin/env git clone https://github.com/DavidJRobertson/oh-my-zsh.git ~/.oh-my-zsh || {
   echo "git not installed"
   exit
 }
 
+
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
 then