diff --git a/.Xresources b/.config/xorg/Xresources
similarity index 100%
rename from .Xresources
rename to .config/xorg/Xresources
diff --git a/.config/xorg/xinitrc b/.config/xorg/xinitrc
new file mode 100644
index 0000000..b5e874f
--- /dev/null
+++ b/.config/xorg/xinitrc
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+xrdb "$XDG_CONFIG_HOME/xorg/Xresources"
+
+# GTK application scaling
+export GDK_SCALE=2
+export GDK_DPI_SCALE=0.5
+
+# Screensaver
+xset s off
+xset -dmps
+
+exec i3
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
new file mode 100644
index 0000000..6f49e75
--- /dev/null
+++ b/.config/zsh/.zshrc
@@ -0,0 +1,92 @@
+## Settings
+
+# Directories
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+
+# X11
+export XINITRC="$XDG_CONFIG_HOME/xorg/xinitrc"
+export XAUTHORITY="$XDG_DATA_HOME/xorg/Xauthority"
+
+## ZSH
+
+autoload -Uz promptinit colors vcs_info compinit
+
+# Prompt
+promptinit
+colors
+setopt INTERACTIVE_COMMENTS
+setopt PROMPT_SUBST
+
+precmd() {
+	vcs_info
+}
+
+USR_HOST="$fg[cyan]%n$reset_color@$fg[cyan]%m$reset_color"
+DIRECTORY="$fg[green]%~$reset_color"
+ARROW="%(?::$fg[red])➤$reset_color"
+PROMPT='╭─${USR_HOST} ${DIRECTORY} ${vcs_info_msg_0_}
+╰─${ARROW} '
+RPROMPT='%t'
+
+# Git
+zstyle ':vcs_info:*' enable git
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:*' stagedstr "$fg[green]A$reset_color"
+zstyle ':vcs_info:*' unstagedstr "$fg[red]M$reset_color"
+zstyle ':vcs_info:*' formats "$fg[cyan]($fg[red]%b$fg[cyan])$reset_color %c%u"
+
+# Autocompletion
+compinit -d $XDG_CACHE_HOME/zcompdump
+zstyle ':completion::complete:*' use-cache 1
+zstyle ':completion::complete:*' cache-path $XDG_CACHE_HOME/zcache
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=* r:|=*'
+zstyle ':completion:*' list-colors ''
+zstyle ':completion:*' menu select
+
+# History
+setopt APPEND_HISTORY
+setopt EXTENDED_HISTORY
+setopt HIST_FIND_NO_DUPS
+setopt HIST_IGNORE_ALL_DUPS
+setopt HIST_IGNORE_DUPS
+setopt HIST_REDUCE_BLANKS
+setopt HIST_SAVE_NO_DUPS
+HISTFILE=$ZDOTDIR/.zsh_history
+HISTSIZE=10000
+SAVEHIST=10000
+
+## Aliases
+
+alias la='ls -laGh --color'
+alias ls='ls --color'
+alias rm='rm -i'
+alias zrc='nano $ZDOTDIR/.zshrc'
+alias lzrc='source $ZDOTDIR/.zshrc'
+
+alias install='sudo pacman -S'
+alias remove='sudo pacman -Rns'
+alias update='sudo pacman -Syy; sudo pacman -Syu'
+alias clean='sudo pacman -Rns $(pacman -Qtdq)'
+
+alias poweroff='systemctl poweroff'
+alias reboot='systemctl reboot'
+
+alias upl='platformio run --target=upload'
+alias ser='platformio serialports monitor --baud 9600'
+
+# Git
+alias gl="git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d    %C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"
+
+# Laptop
+alias offtouchpad='sudo rmmod i2c_hid'
+alias ontouchpad='sudo modprobe i2c_hid'
+alias homenetwork='sudo netctl start wlan0-merlin-router5GHz'
+
+# Other
+source $ZDOTDIR/.zshrc_extended
+
+## Login
+
+[[ $USER == "rick" ]] && [ "$(tty)" = "/dev/tty1" ] && exec xinit -- vt1 &> /dev/null
diff --git a/.xinitrc b/.xinitrc
deleted file mode 100644
index 91acb1d..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-# Merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# Start some nice programs
-
-export GDK_SCALE=2
-export GDK_DPI_SCALE=0.5
-
-exec i3
diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
new file mode 100644
index 0000000..558223f
--- /dev/null
+++ b/etc/zsh/zshenv
@@ -0,0 +1 @@
+ZDOTDIR=$HOME/.config/zsh