diff --git a/dotfiles/zsh/zsh.themes/agnoster-plus.zsh-theme b/dotfiles/zsh/zsh.themes/agnoster-plus.zsh-theme
deleted file mode 100644
index d233932..0000000
--- a/dotfiles/zsh/zsh.themes/agnoster-plus.zsh-theme
+++ /dev/null
@@ -1,209 +0,0 @@
-# vim:ft=zsh ts=2 sw=2 sts=2
-#
-# agnoster's Theme - https://gist.github.com/3712874
-# A Powerline-inspired theme for ZSH
-#
-# # README
-#
-# In order for this theme to render correctly, you will need a
-# [Powerline-patched font](https://gist.github.com/1595572).
-#
-# In addition, I recommend the
-# [Solarized theme](https://github.com/altercation/solarized/) and, if you're
-# using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app -
-# it has significantly better color fidelity.
-#
-# # Goals
-#
-# The aim of this theme is to only show you *relevant* information. Like most
-# prompts, it will only show git information when in a git working directory.
-# However, it goes a step further: everything from the current user and
-# hostname to whether the last call exited with an error to whether background
-# jobs are running in this shell will all be displayed automatically when
-# appropriate.
-
-### Segment drawing
-# A few utility functions to make it easy and re-usable to draw segmented prompts
-
-CURRENT_BG='NONE'
-if [[ -z "$PRIMARY_FG" ]]; then
-	PRIMARY_FG=black
-fi
-
-# Characters
-SEGMENT_SEPARATOR="\ue0b0"
-PLUSMINUS="\u00b1"
-BRANCH="\ue0a0"
-DETACHED="\u27a6"
-CROSS="\u2718"
-LIGHTNING="\u26a1"
-GEAR="\u2699"
-
-
-# Setup powerline style colouring
-POWERLINE_COLOR_BG_GRAY=%K{240}
-POWERLINE_COLOR_BG_LIGHT_GRAY=%K{240}
-POWERLINE_COLOR_BG_WHITE=%K{255}
-
-POWERLINE_COLOR_FG_GRAY=%F{240}
-POWERLINE_COLOR_FG_LIGHT_GRAY=%F{240}
-POWERLINE_COLOR_FG_WHITE=%F{255}
-
-POWERLINE_SEPARATOR=$'\u2b80'
-POWERLINE_R_SEPARATOR=$'\u2b82'
-
-# Begin a segment
-# Takes two arguments, background and foreground. Both can be omitted,
-# rendering default background/foreground.
-prompt_segment() {
-  local bg fg
-  [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
-  [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
-  if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
-    print -n "%{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%}"
-  else
-    print -n "%{$bg%}%{$fg%}"
-  fi
-  CURRENT_BG=$1
-  [[ -n $3 ]] && print -n $3
-}
-
-# End the prompt, closing any open segments
-prompt_end() {
-  if [[ -n $CURRENT_BG ]]; then
-    print -n "%{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
-  else
-    print -n "%{%k%}"
-  fi
-  print -n "%{%f%}"
-  CURRENT_BG=''
-}
-
-### Prompt components
-# Each component will draw itself, and hide itself if no information needs to be shown
-
-# Context: user@hostname (who am I and where am I)
-prompt_context() {
-  local user=`whoami`
-
-  if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CONNECTION" ]]; then
-    prompt_segment $PRIMARY_FG default " %(!.%{%F{yellow}%}.)$user@%m "
-  fi
-}
-
-# Git: branch/detached head, dirty status
-prompt_git() {
-  local color ref
-  is_dirty() {
-    test -n "$(git status --porcelain --ignore-submodules)"
-  }
-  ref="$vcs_info_msg_0_"
-  if [[ -n "$ref" ]]; then
-    if is_dirty; then
-      color=yellow
-      ref="${ref} $PLUSMINUS"
-    else
-      color=green
-      ref="${ref} "
-    fi
-    if [[ "${ref/.../}" == "$ref" ]]; then
-      ref="$BRANCH $ref"
-    else
-      ref="$DETACHED ${ref/.../}"
-    fi
-    prompt_segment $color $PRIMARY_FG
-    print -n " $ref"
-  fi
-}
-
-# Dir: current working directory
-prompt_dir() {
-  prompt_segment blue $PRIMARY_FG ' %~ '
-}
-
-# Status:
-# - was there an error
-# - am I root
-# - are there background jobs?
-prompt_status() {
-  local symbols
-  symbols=()
-  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}$CROSS"
-  [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}$LIGHTNING"
-  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$GEAR"
-
-  [[ -n "$symbols" ]] && prompt_segment $PRIMARY_FG default " $symbols "
-}
-
-# Display current virtual environment
-prompt_virtualenv() {
-  if [[ -n $VIRTUAL_ENV ]]; then
-    color=cyan
-    prompt_segment $color $PRIMARY_FG
-    print -Pn " $(basename $VIRTUAL_ENV) "
-  fi
-}
-
-## Main prompt
-prompt_agnoster_main() {
-  RETVAL=$?
-  CURRENT_BG='NONE'
-  prompt_status
-  # prompt_context
-  prompt_virtualenv
-  prompt_dir
-  prompt_git
-  prompt_end
-}
-
-
-function rvm_info_for_prompt {
-  if [[ -d ~/.rvm/ ]]; then
-    local ruby_version=$(~/.rvm/bin/rvm-prompt)
-    if [ -n "$ruby_version" ]; then
-      echo "$ruby_version"
-    fi
-  else
-    echo ""
-  fi
-}
-
-
-prompt_agnoster_precmd() {
-  vcs_info
-
-  rvm_split=("${(s/@/)$(rvm_info_for_prompt)}")
-  local powerline_right_version=$rvm_split[1]
-  local powerline_right_gemset=$rvm_split[2]
-
-  if [ -z $powerline_right_gemset  ]; then
-    RVM_PROMPT=""
-  else
-    RVM_PROMPT=$POWERLINE_COLOR_BG_WHITE$POWERLINE_COLOR_FG_LIGHT_GRAY$powerline_right_version@$POWERLINE_COLOR_BG_WHITE$POWERLINE_COLOR_FG_GRAY$powerline_right_gemset
-  fi
-  PYENV_PROMPT=$POWERLINE_COLOR_BG_WHITE$POWERLINE_COLOR_FG_GRAY$python_info[virtualenv]
-
-  PROMPT='$RVM_PROMPT$PYENV_PROMPT%{%f%b%k%}$(prompt_agnoster_main) '
-}
-
-prompt_agnoster_setup() {
-  autoload -Uz add-zsh-hook
-  autoload -Uz vcs_info
-
-  prompt_opts=(cr subst percent)
-
-  add-zsh-hook precmd prompt_agnoster_precmd
-
-  zstyle ':vcs_info:*' enable git
-  zstyle ':vcs_info:*' check-for-changes false
-  zstyle ':vcs_info:git*' formats '%b'
-  zstyle ':vcs_info:git*' actionformats '%b (%a)'
-
-  # Set python-info parameters.
-  zstyle ':prezto:module:python:info:virtualenv' format '(%v)'
-
-  zstyle ':prezto:module:ruby' rvm '%r'
-
-}
-
-prompt_agnoster_setup "$@"
diff --git a/dotfiles/zsh/zsh.themes/marc-pygmalion.zsh-theme b/dotfiles/zsh/zsh.themes/marc-pygmalion.zsh-theme
deleted file mode 100644
index 2f8e877..0000000
--- a/dotfiles/zsh/zsh.themes/marc-pygmalion.zsh-theme
+++ /dev/null
@@ -1,40 +0,0 @@
-# Yay! High voltage and arrows!
-
-prompt_setup_pygmalion(){
-  ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[red]%}|"
-  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-  ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
-  ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-  base_prompt='%{$fg[green]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%1~%{$reset_color%}'
-  post_prompt=' '
-
-  base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
-  post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
-
-  autoload -U add-zsh-hook
-  add-zsh-hook precmd prompt_pygmalion_precmd
-}
-
-prompt_pygmalion_precmd(){
-  local gitinfo=$(git_prompt_info)
-  local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
-  local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
-  local prompt_length=${#exp_nocolor}
-
-  local nl=""
-  post_prompt=' '
-
-
-  if [ ${#gitinfo} -ne 0 ] ; then
-    gitinfo=${gitinfo[1,-2]}
-  fi
-
-  if [[ $prompt_length -gt 40 ]]; then
-    nl=$'\n%{\r%}';
-    post_prompt='%{$fg[green]%}~> %{$reset_color%}';
-  fi
-  PROMPT="$base_prompt$gitinfo$nl$post_prompt"
-}
-
-prompt_setup_pygmalion
diff --git a/dotfiles/zsh/zsh.themes/the-one.zsh-theme b/dotfiles/zsh/zsh.themes/the-one.zsh-theme
deleted file mode 100644
index 1a4b0f0..0000000
--- a/dotfiles/zsh/zsh.themes/the-one.zsh-theme
+++ /dev/null
@@ -1,19 +0,0 @@
-# The One Theme v1.0.0
-#
-# https://github.com/benniemosher/the-one-theme
-#
-# Copyright 2015, All rights reserved
-#
-# Code licensed under the MIT license
-# http://benniemosher.mit-license.org
-#
-# @author Bennie Mosher <benniemosher@gmail.com>
-#
-# modded by Marc
-
-PROMPT='%{$fg[yellow]%}%m %{$fg_bold[green]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[blue]%}%~ $(git_prompt_info)% %{$reset_color%}'
-
-ZSH_THEME_GIT_PROMPT_CLEAN=") %{$fg_bold[green]%}✔ "
-ZSH_THEME_GIT_PROMPT_DIRTY=") %{$fg_bold[yellow]%}✗ "
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[red]%}("
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"