diff --git a/zsh/joshtronic.zsh-theme b/zsh/joshtronic.zsh-theme
deleted file mode 100644
index d14730d..0000000
--- a/zsh/joshtronic.zsh-theme
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/zsh
-
-function username() {
-  if [[ `whoami` != 'josh' ]]; then
-    echo %{$FG[248]%}%n
-  fi
-}
-
-function server() {
-  if [[ `hostname` != josh-* ]]; then
-    echo "%{$FG[244]%}@%{$fg[magenta]%}%m "
-  fi
-}
-
-PROMPT_USER="$(username)$(server)"
-PROMPT='
-%{$PROMPT_USER%}%{$fg[blue]%}%~ $(git_prompt_info)
-%{$FG[244]%}%# %{$reset_color%}'
-
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
diff --git a/zsh/zshrc b/zsh/zshrc
index d4182ea..71ee257 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -15,12 +15,9 @@ source $DOTFILES/zsh/`uname`.zshrc
 source $DOTFILES/vendor/zsh-users/antigen/antigen.zsh
 
 antigen-use oh-my-zsh
-antigen-theme $DOTFILES/zsh joshtronic
-
 antigen-bundle zsh-users/zsh-completions
 antigen-bundle zsh-users/zsh-syntax-highlighting
 antigen-bundle zsh-users/zsh-history-substring-search
-
 antigen-apply
 
 bindkey '^[[A' history-substring-search-up
@@ -102,3 +99,26 @@ ssh() {
     command ssh "$@"
   fi
 }
+
+function username() {
+  if [[ `whoami` != 'josh' ]]; then
+    echo %{$FG[248]%}%n
+  fi
+}
+
+function server() {
+  if [[ `hostname` != josh-* ]]; then
+    echo "%{$FG[244]%}@%{$fg[magenta]%}%m "
+  fi
+}
+
+PROMPT_USER="$(username)$(server)"
+PROMPT='
+%{$PROMPT_USER%}%{$fg[blue]%}%~ $(git_prompt_info)
+%{$FG[244]%}%# %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+