diff --git a/themes/macgregor.zsh-theme b/themes/macgregor.zsh-theme
new file mode 100644
index 000000000..7d720a658
--- /dev/null
+++ b/themes/macgregor.zsh-theme
@@ -0,0 +1,17 @@
+PROMPT='${SMILEY} %{$fg[magenta]%}%n%{$reset_color%}[at]%{$fg[yellow]%}%m%{$reset_color%}%{$reset_color%} $(prompt_char) '
+
+RPROMPT='in %{$fg[green]%}${PWD/#$HOME/~}%{$reset_color%}'
+
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo '±' && return
+    hg root >/dev/null 2>/dev/null && echo '☿' && return
+    echo '○'
+}
+
+
+ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
+
+SMILEY="%(?,%{$fg[green]%}✔%{$reset_color%},%{$fg[red]%}✘%{$reset_color%})"
\ No newline at end of file