diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 087bae9bb809..b71785b1607c 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -25,7 +25,7 @@ function title {
       print -Pn "\ek${1:q}\e\\" # set screen hardstatus
       ;;
     *)
-      if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+      if [[ "$TERM_PROGRAM" == "iTerm.app" ]] || [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
         print -Pn "\e]2;${2:q}\a" # set window name
         print -Pn "\e]1;${1:q}\a" # set tab name
       else
diff --git a/themes/ttelford.zsh-theme b/themes/ttelford.zsh-theme
new file mode 100644
index 000000000000..08027c267ef6
--- /dev/null
+++ b/themes/ttelford.zsh-theme
@@ -0,0 +1,37 @@
+# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
+#
+# - Look into the 'kolo' theme for what may be a better way to do multiple
+# version control systems.
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+GIT_DIRTY_COLOR=$FG[133]
+GIT_CLEAN_COLOR=$FG[118]
+GIT_PROMPT_INFO=$FG[112]
+
+local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
+local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}'
+#local git_branch='$(git_prompt_info)%{$reset_color%}'
+local git_branch='%{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status)%{$reset_color%}'
+
+#PROMPT="╭─${user_host} ${current_dir}
+#╰─%B$%b "
+#RPS1="${git_branch} ${return_code}"
+PROMPT="╭─${user_host} ${current_dir} ${git_branch}
+╰─%B$%b "
+#PROMPT="${user_host}:${current_dir}${git_branch}%B$%b "
+RPS1="${return_code}"
+
+#ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
+#ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" (± "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%})"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%} "