diff --git a/.gitmodules b/.gitmodules
index 7fe50f7..cf92bea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
-[submodule "zsh/zilsh"]
-	path = zsh/zilsh
-	url = git@github.com:zilsh/zilsh.git
-[submodule "zsh/bundle/oh-my-zilsh"]
-	path = zsh/bundle/oh-my-zilsh
-	url = git@github.com:zilsh/oh-my-zilsh.git
 [submodule "vim/bundle/Vundle.vim"]
 	path = vim/bundle/Vundle.vim
 	url = https://github.com/gmarik/Vundle.vim.git
+[submodule "oh-my-zsh"]
+	path = oh-my-zsh
+	url = git@github.com:robbyrussell/oh-my-zsh.git
diff --git a/oh-my-zsh b/oh-my-zsh
new file mode 160000
index 0000000..1b7a3ea
--- /dev/null
+++ b/oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit 1b7a3ea99a8b566510ab7881063148c43be6b98d
diff --git a/zsh/bundle/keybindings/init.zsh b/zsh/bundle/keybindings/init.zsh
deleted file mode 100644
index 941c092..0000000
--- a/zsh/bundle/keybindings/init.zsh
+++ /dev/null
@@ -1,40 +0,0 @@
-# create a zkbd compatible hash;
-# to add other keys to this hash, see: man 5 terminfo
-typeset -A key
-
-key[Home]=${terminfo[khome]}
-
-key[End]=${terminfo[kend]}
-key[Insert]=${terminfo[kich1]}
-key[Delete]=${terminfo[kdch1]}
-key[Up]=${terminfo[kcuu1]}
-key[Down]=${terminfo[kcud1]}
-key[Left]=${terminfo[kcub1]}
-key[Right]=${terminfo[kcuf1]}
-key[PageUp]=${terminfo[kpp]}
-key[PageDown]=${terminfo[knp]}
-
-# setup key accordingly
-[[ -n "${key[Home]}"     ]]  && bindkey  "${key[Home]}"     beginning-of-line
-[[ -n "${key[End]}"      ]]  && bindkey  "${key[End]}"      end-of-line
-[[ -n "${key[Insert]}"   ]]  && bindkey  "${key[Insert]}"   overwrite-mode
-[[ -n "${key[Delete]}"   ]]  && bindkey  "${key[Delete]}"   delete-char
-[[ -n "${key[Up]}"       ]]  && bindkey  "${key[Up]}"       up-line-or-history
-[[ -n "${key[Down]}"     ]]  && bindkey  "${key[Down]}"     down-line-or-history
-[[ -n "${key[Left]}"     ]]  && bindkey  "${key[Left]}"     backward-char
-[[ -n "${key[Right]}"    ]]  && bindkey  "${key[Right]}"    forward-char
-[[ -n "${key[PageUp]}"   ]]  && bindkey  "${key[PageUp]}"   beginning-of-buffer-or-history
-[[ -n "${key[PageDown]}" ]]  && bindkey  "${key[PageDown]}" end-of-buffer-or-history
-
-# Finally, make sure the terminal is in application mode, when zle is
-# active. Only then are the values from $terminfo valid.
-if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
-    function zle-line-init () {
-        printf '%s' "${terminfo[smkx]}"
-    }
-    function zle-line-finish () {
-        printf '%s' "${terminfo[rmkx]}"
-    }
-    zle -N zle-line-init
-    zle -N zle-line-finish
-fi
diff --git a/zsh/bundle/npm/init.zsh b/zsh/bundle/npm/init.zsh
deleted file mode 100644
index da9818d..0000000
--- a/zsh/bundle/npm/init.zsh
+++ /dev/null
@@ -1,53 +0,0 @@
-###-begin-npm-completion-###
-#
-# npm command completion script
-#
-# Installation: npm completion >> ~/.bashrc  (or ~/.zshrc)
-# Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm
-#
-
-COMP_WORDBREAKS=${COMP_WORDBREAKS/=/}
-COMP_WORDBREAKS=${COMP_WORDBREAKS/@/}
-export COMP_WORDBREAKS
-
-if type complete &>/dev/null; then
-  _npm_completion () {
-    local si="$IFS"
-    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$COMP_CWORD" \
-                           COMP_LINE="$COMP_LINE" \
-                           COMP_POINT="$COMP_POINT" \
-                           npm completion -- "${COMP_WORDS[@]}" \
-                           2>/dev/null)) || return $?
-    IFS="$si"
-  }
-  complete -F _npm_completion npm
-elif type compdef &>/dev/null; then
-  _npm_completion() {
-    si=$IFS
-    compadd -- $(COMP_CWORD=$((CURRENT-1)) \
-                 COMP_LINE=$BUFFER \
-                 COMP_POINT=0 \
-                 npm completion -- "${words[@]}" \
-                 2>/dev/null)
-    IFS=$si
-  }
-  compdef _npm_completion npm
-elif type compctl &>/dev/null; then
-  _npm_completion () {
-    local cword line point words si
-    read -Ac words
-    read -cn cword
-    let cword-=1
-    read -l line
-    read -ln point
-    si="$IFS"
-    IFS=$'\n' reply=($(COMP_CWORD="$cword" \
-                       COMP_LINE="$line" \
-                       COMP_POINT="$point" \
-                       npm completion -- "${words[@]}" \
-                       2>/dev/null)) || return $?
-    IFS="$si"
-  }
-  compctl -K _npm_completion npm
-fi
-###-end-npm-completion-###
diff --git a/zsh/bundle/oh-my-zilsh b/zsh/bundle/oh-my-zilsh
deleted file mode 160000
index 176f978..0000000
--- a/zsh/bundle/oh-my-zilsh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 176f97872e7c7c66ea2ef26224259fbe4dc30f33
diff --git a/zsh/zilsh b/zsh/zilsh
deleted file mode 160000
index 7b1881d..0000000
--- a/zsh/zilsh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7b1881de4b77c52dfabe3278d2add6d9e3d8ccda
diff --git a/zshrc b/zshrc
index b6a1a63..601dcb5 100644
--- a/zshrc
+++ b/zshrc
@@ -1,35 +1,25 @@
-ZILSH_VERBOSITY=2
+export ZSH=$HOME/.oh-my-zsh
 
-autoload -U colors && colors
-source ~/.zsh/zilsh/zilsh.zsh
+ZSH_THEME="pygmalion"
 
-# oh-my-zilch config
-#
-
-omz_plugins=(bower gitfast git-extras node npm pass screen vi-mode)
+plugins=(bower gitfast git-extras node npm pass screen vi-mode)
 
 case $(hostname) in
     t430s-arch)
-        omz_plugins+=(archlinux systemd)
+        plugins+=(archlinux systemd)
         ;;
     cassiopeia.uberspace.de)
-        omz_plugins+=()
+        plugins+=()
         ;;
     everard)
-        omz_plugins+=(debian jira)
+        plugins+=(debian jira)
         ;;
 esac
 
+source $ZSH/oh-my-zsh.sh
 
-ZILSH_THEME="pygmalion.zsh-theme"
-
-_zilsh_init "~/.zsh/bundle/"
-
-############
-## Settings
-#############
-PATH="$PATH:$HOME/local/bin"
-EDITOR="vim"
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
 
 # turn of autocorrection
 unsetopt correct_all