diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..cfce077
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dotfiles/vim/pack/matir/opt/solarized8"]
+	path = dotfiles/vim/pack/matir/opt/solarized8
+	url = https://github.com/lifepillar/vim-solarized8.git
diff --git a/dotfiles/vim/pack/matir/opt/.keep b/dotfiles/vim/pack/matir/opt/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/dotfiles/vim/pack/matir/opt/solarized8 b/dotfiles/vim/pack/matir/opt/solarized8
new file mode 160000
index 0000000..b9731ee
--- /dev/null
+++ b/dotfiles/vim/pack/matir/opt/solarized8
@@ -0,0 +1 @@
+Subproject commit b9731eed54c9ed9520d19c08b582f8e8f8355576
diff --git a/dotfiles/vim/pack/matir/start/.keep b/dotfiles/vim/pack/matir/start/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index d42dddd..5d8f758 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -1,30 +1,6 @@
 " Allow full use of vim options
 set nocompatible
 
-" Enable Vundle if installed
-if filereadable(glob("~/.vim/bundle/Vundle.vim/README.md"))
-  filetype off
-  set rtp+=~/.vim/bundle/Vundle.vim
-  call vundle#begin()
-  Plugin 'gmarik/Vundle.vim'
-  Plugin 'nvie/vim-flake8'
-  Plugin 'tell-k/vim-autopep8'
-  Plugin 'tpope/vim-fugitive'
-  Plugin 'mileszs/ack.vim'
-  Plugin 'tpope/vim-unimpaired'
-  Plugin 'scrooloose/syntastic'
-  Plugin 'mattn/webapi-vim'
-  Plugin 'mattn/gist-vim'
-  Plugin 'altercation/vim-colors-solarized'
-  Plugin 'vimoutliner/vimoutliner'
-  Plugin 'PotatoesMaster/i3-vim-syntax'
-  Plugin 'Matt-Deacalion/vim-systemd-syntax'
-  Plugin 'fatih/vim-go'
-  Plugin 'vhda/verilog_systemverilog.vim'
-  Plugin 'editorconfig/editorconfig-vim'
-  call vundle#end()
-endif
-
 " Setup paths
 set backupdir=~/.cache/vim/backup//
 set directory=~/.cache/vim/swap//
@@ -64,7 +40,7 @@ else
   let g:solarized_termcolors=256
   let g:solarized_termtrans=1
 endif
-silent! colorscheme solarized
+silent! colorscheme solarized8
 " Enable filetype support
 filetype plugin indent on
 " Default ASM syntax for ft support
diff --git a/install.sh b/install.sh
index a4a1ffc..7a07978 100755
--- a/install.sh
+++ b/install.sh
@@ -44,11 +44,6 @@ prerequisites() {
   else
     echo "ZSH not found!" >&2
   fi
-  if which vim > /dev/null 2>&1 ; then
-    mkdir -p $HOME/.vim/bundle
-    install_git https://github.com/VundleVim/Vundle.vim.git \
-      $HOME/.vim/bundle/Vundle.vim
-  fi
 }
 
 install_dotfile_dir() {