diff --git a/.zsh/.gitignore b/.config/zsh/.gitignore
similarity index 100%
rename from .zsh/.gitignore
rename to .config/zsh/.gitignore
diff --git a/.zprofile b/.config/zsh/.zprofile
similarity index 100%
rename from .zprofile
rename to .config/zsh/.zprofile
diff --git a/.zshrc b/.config/zsh/.zshrc
similarity index 64%
rename from .zshrc
rename to .config/zsh/.zshrc
index 38c4fd7..564f395 100644
--- a/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,42 +1,46 @@
-# -*- Mode: shell-script; eval: (git-auto-commit-mode 1) -*-
+# -*- Mode: shell-script; -*-
 # Setup variables
-HISTFILE=~/.zsh/histfile
+HISTFILE=$ZDOTDIR/histfile
 HISTSIZE=1000
 SAVEHIST=1000
+LESSCMD="/usr/bin/less -FXRS"
+
+export LESS_TERMCAP_mb=$'\e[1;37m'
+export LESS_TERMCAP_md=$'\e[1;37m'
+export LESS_TERMCAP_me=$'\e[0m'
+export LESS_TERMCAP_se=$'\e[0m'
+export LESS_TERMCAP_so=$'\e[1;47;30m'
+export LESS_TERMCAP_ue=$'\e[0m'
+export LESS_TERMCAP_us=$'\e[0;36m'
+export PAGER=$LESSCMD
+
+# Aliases
+alias alpine="alpine -p ""{imap.gmail.com/ssl/user=tom.willemsen@archlinux.us}remote_pinerc"""
+alias evolus-pencil="/usr/lib/evolus-pencil-svn/evolus-pencil.sh"
+alias grep="grep --color=always"
+alias less=$LESSCMD
+alias ls="ls -F --color=always"
+alias mysql="mysql --pager"
+alias reboot="systemctl reboot"
+alias poweroff="systemctl poweroff"
 
 setopt notify
 # Allow for functions in the prompt
 setopt PROMPT_SUBST
 setopt EXTENDED_GLOB
 
-zstyle :compinstall filename '/home/slash/.zshrc'
+zstyle :compinstall filename '$ZDOTDIR/.zshrc'
 
 autoload -Uz compinit
 compinit
 
-function shutdown()
-{
-    dbus-send --system --print-reply \
-        --dest="org.freedesktop.ConsoleKit" \
-        /org/freedesktop/ConsoleKit/Manager \
-        org.freedesktop.ConsoleKit.Manager.Stop
-}
-
-function reboot()
-{
-    dbus-send --system --print-reply \
-        --dest="org.freedesktop.ConsoleKit" \
-        /org/freedesktop/ConsoleKit/Manager \
-        org.freedesktop.ConsoleKit.Manager.Restart
-}
-
 # Initialize colors.
 autoload -U colors
 colors
 
 # Autoload zsh functions.
-fpath=(~/.zsh/functions $fpath)
-autoload -U ~/.zsh/functions/*(:t)
+fpath=($ZDOTDIR/functions $fpath)
+autoload -U $ZDOTDIR/functions/*(:t)
 
 # Enable auto-execution of functions
 typeset -ga preexec_functions
@@ -53,7 +57,7 @@ chpwd_functions+='chpwd_update_git_vars'
 PROMPT='$(prompt)'
 RPROMPT='$(rprompt)'
 
-# Set terminal name to current runnign application
+# Set terminal name to current running application
 case $TERM in
     rxvt*)
         precmd () { print -Pn "\e]0;%~\a" }
@@ -88,7 +92,7 @@ bindkey "^W" backward-delete-char
 
 # Show syntax highlighting when we're not running in emacs
 if [ -z $EMACS ]; then
-    source ~/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh
+    source $ZDOTDIR/syntax-highlighting/zsh-syntax-highlighting.zsh
 
     ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=blue'
     ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=blue'
diff --git a/.zsh/functions/chpwd_show_todo b/.config/zsh/functions/chpwd_show_todo
similarity index 100%
rename from .zsh/functions/chpwd_show_todo
rename to .config/zsh/functions/chpwd_show_todo
diff --git a/.zsh/functions/chpwd_update_git_vars b/.config/zsh/functions/chpwd_update_git_vars
similarity index 100%
rename from .zsh/functions/chpwd_update_git_vars
rename to .config/zsh/functions/chpwd_update_git_vars
diff --git a/.zsh/functions/env b/.config/zsh/functions/env
similarity index 100%
rename from .zsh/functions/env
rename to .config/zsh/functions/env
diff --git a/.zsh/functions/get_cnt b/.config/zsh/functions/get_cnt
similarity index 100%
rename from .zsh/functions/get_cnt
rename to .config/zsh/functions/get_cnt
diff --git a/.zsh/functions/line b/.config/zsh/functions/line
similarity index 100%
rename from .zsh/functions/line
rename to .config/zsh/functions/line
diff --git a/.zsh/functions/precmd_update_git_vars b/.config/zsh/functions/precmd_update_git_vars
similarity index 100%
rename from .zsh/functions/precmd_update_git_vars
rename to .config/zsh/functions/precmd_update_git_vars
diff --git a/.zsh/functions/precmd_update_updates b/.config/zsh/functions/precmd_update_updates
similarity index 100%
rename from .zsh/functions/precmd_update_updates
rename to .config/zsh/functions/precmd_update_updates
diff --git a/.zsh/functions/preexec_update_vars b/.config/zsh/functions/preexec_update_vars
similarity index 100%
rename from .zsh/functions/preexec_update_vars
rename to .config/zsh/functions/preexec_update_vars
diff --git a/.zsh/functions/prompt b/.config/zsh/functions/prompt
similarity index 100%
rename from .zsh/functions/prompt
rename to .config/zsh/functions/prompt
diff --git a/.zsh/functions/prompt_git_info b/.config/zsh/functions/prompt_git_info
similarity index 100%
rename from .zsh/functions/prompt_git_info
rename to .config/zsh/functions/prompt_git_info
diff --git a/.zsh/functions/rprompt b/.config/zsh/functions/rprompt
similarity index 100%
rename from .zsh/functions/rprompt
rename to .config/zsh/functions/rprompt
diff --git a/.zsh/functions/update_current_git_vars b/.config/zsh/functions/update_current_git_vars
similarity index 100%
rename from .zsh/functions/update_current_git_vars
rename to .config/zsh/functions/update_current_git_vars
diff --git a/.zsh/functions/welcome b/.config/zsh/functions/welcome
similarity index 100%
rename from .zsh/functions/welcome
rename to .config/zsh/functions/welcome
diff --git a/.gitmodules b/.gitmodules
index 2c0dce7..e368c11 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule ".zsh/syntax-highlighting"]
-	path = .zsh/syntax-highlighting
+[submodule ".config/zsh/syntax-highlighting"]
+	path = .config/zsh/syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting
diff --git a/.zshenv b/.zshenv
deleted file mode 100644
index d515549..0000000
--- a/.zshenv
+++ /dev/null
@@ -1,21 +0,0 @@
-LESSCMD="less -FXRS"
-
-export LESS_TERMCAP_mb=$'\e[1;37m'
-export LESS_TERMCAP_md=$'\e[1;37m'
-export LESS_TERMCAP_me=$'\e[0m'
-export LESS_TERMCAP_se=$'\e[0m'
-export LESS_TERMCAP_so=$'\e[1;47;30m'
-export LESS_TERMCAP_ue=$'\e[0m'
-export LESS_TERMCAP_us=$'\e[0;36m'
-
-export PAGER=$LESSCMD
-
-# Aliases
-alias alpine="alpine -p ""{imap.gmail.com/ssl/user=tom.willemsen@archlinux.us}remote_pinerc"""
-alias evolus-pencil="/usr/lib/evolus-pencil-svn/evolus-pencil.sh"
-alias grep="grep --color=always"
-alias less=$LESSCMD
-alias ls="ls -F --color=always"
-alias mysql="mysql --pager"
-alias reboot="systemctl reboot"
-alias poweroff="systemctl poweroff"