diff --git a/.gitmodules b/.gitmodules
index 1ca706c..c432241 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "base16-shell"]
 	path = base16-shell
 	url = git@github.com:chriskempson/base16-shell.git
-[submodule "zgen"]
-	path = zgen
-	url = git@github.com:tarjoilija/zgen.git
+[submodule "zplug"]
+	path = zplug
+	url = https://github.com/zplug/zplug
diff --git a/gitconfig b/gitconfig
index dd44a3a..2527c70 100644
--- a/gitconfig
+++ b/gitconfig
@@ -20,6 +20,7 @@
     diffstat = diff --stat -r
     lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
     fix = "!f() { ${EDITOR} $(git diff --name-only | uniq ); }; f"
+    last = "!l() { ${EDITOR} $(git diff-tree --no-commit-id --name-only -r HEAD ); }; l"
 [merge]
     tool = bc3
 [mergetool]
diff --git a/vimrc b/vimrc
index 9432f83..dcf063d 100644
--- a/vimrc
+++ b/vimrc
@@ -23,6 +23,8 @@ Plug 'ludovicchabant/vim-gutentags'
 
 Plug 'nathanaelkane/vim-indent-guides'
 
+Plug 'fholgado/minibufexpl.vim'
+
 Plug 'SirVer/ultisnips'
 Plug 'honza/vim-snippets'
 
@@ -62,9 +64,8 @@ set hidden
 set ttyfast
 set synmaxcol=512               " Limit syntax highlighting to 512 characters per line
 set modeline                    " Use file-specific settings, if available.
-set backup                      " Make backup files.
-set backupdir=~/.vim/backup     " Backup directory.
-set directory=~/.vim/tmp        " Directory for swap files.
+set nobackup
+set noswapfile
 set mouse=a                     " Mouse support everywhere.
 set mousehide                   " Auto-hide cursor while typing.
 set wildmode=list:longest,full  " Make completion more like zsh.
@@ -119,7 +120,7 @@ set formatoptions+=j            " Delete comment character when joining commente
 
 " Folding {{{
 set foldmethod=indent
-set foldlevelstart=3
+set foldlevelstart=10
 " }}}
 
 " Diff settings {{{
@@ -262,6 +263,9 @@ vnoremap <leader>a y:Ag <c-r>"<cr>
 nnoremap <leader>A :Ag <c-r><c-w><cr>
 nnoremap <leader>c :Commits<cr>
 
+"" minibufexpl
+map <Leader>t :MBEToggle<cr>
+
 "" syntastic
 let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 0
diff --git a/zgen b/zgen
deleted file mode 160000
index 09f5425..0000000
--- a/zgen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 09f542515e20ac655a4aa429cf9604fe698ccf42
diff --git a/zplug b/zplug
new file mode 160000
index 0000000..063d26f
--- /dev/null
+++ b/zplug
@@ -0,0 +1 @@
+Subproject commit 063d26f8009e6a651c124fe8c049346fb49c2769
diff --git a/zshrc b/zshrc
index 2acd7b6..506f6e2 100644
--- a/zshrc
+++ b/zshrc
@@ -1,31 +1,25 @@
-# load zgen
-source "${HOME}/.dotfiles/zgen/zgen.zsh"
+source ~/.dotfiles/zplug/init.zsh
 
-if ! zgen saved; then
-    echo "Creating a zgen save"
 
-    zgen oh-my-zsh lib/spectrum.zsh
-    zgen oh-my-zsh lib/directories.zsh
-    zgen oh-my-zsh lib/grep.zsh
-    zgen oh-my-zsh lib/history.zsh
-    zgen oh-my-zsh lib/misc.zsh
-    zgen oh-my-zsh plugins/common-aliases
-    zgen oh-my-zsh plugins/frontend-search
+zplug "lib/spectrum.zsh", from:oh-my-zsh
+zplug "lib/directories.zsh", from:oh-my-zsh
+zplug "lib/grep.zsh", from:oh-my-zsh
+zplug "lib/history.zsh", from:oh-my-zsh
+zplug "lib/misc.zsh", from:oh-my-zsh
+zplug "plugins/common-aliases", from:oh-my-zsh
+zplug "plugins/frontend-search", from:oh-my-zsh
 
-    zgen load zsh-users/zsh-completions src
-    zgen load zsh-users/zsh-syntax-highlighting
+zplug "zsh-users/zsh-completions", use:"src/*.zsh"
+zplug "zsh-users/zsh-syntax-highlighting", defer:2
 
-    zgen load peterhurford/git-it-on.zsh
-    zgen load gerges/oh-my-zsh-jira-plus
+zplug "peterhurford/git-it-on.zsh"
+zplug "gerges/oh-my-zsh-jira-plus"
 
-    zgen load mafredri/zsh-async
-    zgen load sindresorhus/pure
-
-    zgen save
-fi
+zplug "mafredri/zsh-async"
+zplug "sindresorhus/pure"
 
 ########################
-# Other settings 
+# Other settings
 ########################
 setopt auto_cd
 setopt multios
@@ -78,7 +72,14 @@ bindkey ' ' magic-space
 
 # Base16 Shell
 BASE16_SHELL=$HOME/.base16-shell/
-[ -n "$PS1" ] && dark 
+[ -n "$PS1" ] && dark
 
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+# zplug
+if ! zplug check; then
+    zplug install
+fi
+
+zplug load