diff --git a/.gitmodules b/.gitmodules
index 4ab5a89..87419be 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,9 +2,6 @@
   path = home/.tmux/plugins/tpm
   url = https://github.com/tmux-plugins/tpm
   ignore = dirty
-[submodule "home/.zgen_source"]
-	path = home/.zgen_source
-	url = git@github.com:tarjoilija/zgen.git
 [submodule "home/.config/base16-shell"]
 	path = home/.config/base16-shell
 	url = https://github.com/chriskempson/base16-shell.git
diff --git a/home/.env b/home/.env
index abbc202..147e89a 100644
--- a/home/.env
+++ b/home/.env
@@ -16,6 +16,7 @@ export PATH=$HOME/pear:$PATH
 export PATH=$PATH:/usr/local/share/npm/bin
 export PATH=$PATH:$HOME/.bin
 export PATH=$PATH:$GOPATH/bin
+export PATH=$HOME/.nodebrew/current/bin:$PATH
 # }}}
 
 # Prevent double file (._) file on OSX
@@ -30,66 +31,32 @@ git config --global alias.br "branch"
 git config --global alias.ci "commit"
 # }}}
 
-# {{{
-if [ -d /usr/local/opt/chruby ]; then
-  source /usr/local/opt/chruby/share/chruby/chruby.sh
-  source /usr/local/opt/chruby/share/chruby/auto.sh
-elif [[ -d "$HOME/.rbenv" ]]; then
-  if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
-elif [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
-  source "$HOME/.rvm/scripts/rvm"
-fi
-# }}}
-
-# {{{
-if type "brew" > /dev/null; then
-  if [ -d $(brew --prefix nvm) ]; then
-    source $(brew --prefix nvm)/nvm.sh
-    export NVM_DIR=~/.nvm
-  fi
-  if [ -s $(brew --prefix fasd) ]; then
-    eval "$(fasd --init auto)"
-  fi
-fi
-# }}}
-
-if [ -d "$HOME/.nodebrew/current/bin" ]; then
-  export PATH=$HOME/.nodebrew/current/bin:$PATH
-elif type "nvm" > /dev/null; then
-  export NVM_DIR="$HOME/.nvm"
-  [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
-fi
-
-if type "/usr/local/bin/aws_zsh_completer.sh" > /dev/null; then
-  source /usr/local/bin/aws_zsh_completer.sh
-fi
+eval "$(rbenv init -)"
+eval "$(fasd --init auto)"
+eval "$(direnv hook zsh)"
 
-if type "direnv" > /dev/null; then
-  eval "$(direnv hook zsh)"
-fi
+eval "$(direnv hook zsh)"
 
-if type "pyenv" > /dev/null; then
+if [ -d "$HOME/.pyenv" ]; then
   export PYENV_ROOT="$HOME/.pyenv"
   export PATH="$PYENV_ROOT/bin:$PATH"
   eval "$(pyenv init -)"
 fi
 
-if type "fzf" > /dev/null; then
-  export FZF_DEFAULT_COMMAND='ag --hidden -g ""'
-  export FZF_DEFAULT_OPTS='
-    --bind ctrl-f:page-down,ctrl-b:page-up
-    --color light
-  '
-fi
+export FZF_DEFAULT_COMMAND='ag --hidden -g ""'
+export FZF_DEFAULT_OPTS='
+  --bind ctrl-f:page-down,ctrl-b:page-up
+  --color light
+'
 
 if [ -d $HOME/Library/Android/sdk/platform-tools ]; then
   export PATH=$PATH:$HOME/Library/Android/sdk/platform-tools
 fi
 
-# BASE16_SHELL="$HOME/.config/base16-shell/base16-solarized.light.sh"
-# [[ -s $BASE16_SHELL ]] && source $BASE16_SHELL
+if [ -d /usr/local/bin/aws_zsh_completer ]; then
+  source /usr/local/bin/aws_zsh_completer.sh
+fi
 
-if [ -f ~/.env.local ]
-then
+if [ -f ~/.env.local ]; then
   . ~/.env.local
 fi
diff --git a/home/.zpreztorc b/home/.zpreztorc
deleted file mode 100644
index ec59380..0000000
--- a/home/.zpreztorc
+++ /dev/null
@@ -1,21 +0,0 @@
-zstyle ':prezto:*:*' color 'yes'
-
-zstyle ':prezto:module:editor' key-bindings 'emacs'
-
-# Set the Zsh modules to load (man zshmodules).
-zstyle ':prezto:load' zmodule 'attr' 'stat'
-
-# Set the Zsh functions to load (man zshcontrib).
-zstyle ':prezto:load' zfunction 'zargs' 'zmv'
-
-zstyle ':prezto:module:prompt' theme 'steeef'
-
-zstyle ':prezto:module:syntax-highlighting' highlighters \
-  'main' \
-  'brackets' \
-  'pattern' \
-  'cursor' \
-  'root'
-
-zstyle ':prezto:module:utility:ls' color 'yes'
-zstyle ':prezto:module:autosuggestions' color 'yes'
diff --git a/home/.zshrc b/home/.zshrc
index 9f45f0b..862d539 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -2,10 +2,10 @@
 
 source $HOME/.env
 source $HOME/.aliases
-
-source $HOME/.zgen_source/zgen.zsh
+source $HOME/.zgen/zgen.zsh
 
 if ! zgen saved; then
+  zgen load seletskiy/zsh-zgen-compinit-tweak
   zgen prezto editor key-bindings 'emacs'
   zgen prezto
   zgen prezto command-not-found
@@ -15,7 +15,6 @@ if ! zgen saved; then
   zgen prezto history-substring-search
   zgen prezto autosuggestions
   zgen prezto fasd
-  zgen load zsh-users/zsh-completions src
   zgen load nojhan/liquidprompt
   zgen load knu/zsh-git-escape-magic
   zgen save
@@ -26,5 +25,5 @@ setopt share_history
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 if (which zprof > /dev/null) ;then
-  zprof | less
+  zprof
 fi