diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml
index 409de4a..c959525 100644
--- a/.chezmoiexternal.toml
+++ b/.chezmoiexternal.toml
@@ -3,43 +3,3 @@
     url = "https://github.com/tmux-plugins/tpm/archive/master.tar.gz"
     exact = true
     stripComponents = 1
-[".config/vim/bundle/gruvbox"]
-    type = "archive"
-    url = "https://github.com/morhetz/gruvbox/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/indentLine"]
-    type = "archive"
-    url = "https://github.com/Yggdroot/indentLine/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/lightline.vim"]
-    type = "archive"
-    url = "https://github.com/itchyny/lightline.vim/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/nerdcommenter"]
-    type = "archive"
-    url = "https://github.com/preservim/nerdcommenter/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/nerdtree"]
-    type = "archive"
-    url = "https://github.com/preservim/nerdtree/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/python-syntax"]
-    type = "archive"
-    url = "https://github.com/vim-python/python-syntax/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/tabular"]
-    type = "archive"
-    url = "https://github.com/godlygeek/tabular/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/vim-indent-guides"]
-    type = "archive"
-    url = "https://github.com/nathanaelkane/vim-indent-guides/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/vim-markdown-toc"]
-    type = "archive"
-    url = "https://github.com/mzlogin/vim-markdown-toc/archive/master.tar.gz"
-    stripComponents = 1
-[".config/vim/bundle/vim-surround"]
-    type = "archive"
-    url = "https://github.com/tpope/vim-surround/archive/master.tar.gz"
-    stripComponents = 1
diff --git a/dot_config/vim/README.md b/dot_config/vim/README.md
index 004853c..6f617d6 100644
--- a/dot_config/vim/README.md
+++ b/dot_config/vim/README.md
@@ -36,6 +36,12 @@ Note: Some features require version 8+ of vim. For instance, the ALE plugin whic
 ```
 
 ## Plugins
+Plugins are managed using [vim-plug](https://github.com/junegunn/vim-plug). `vim-plug` is downloaded automatically on first run.
+
+To update the plugins, run `PlugInstall`
+
+Below is a list of currently installed plugins:
+
 * ~~[Easymotion](https://github.com/easymotion/vim-easymotion) - Easily navigate documents~~ Disabled recently as unused, although useful
 * [Gruvbox](https://github.com/morhetz/gruvbox) - Retro colorscheme (colorscheme in vimrc)
 * ~~[Matchit](https://github.com/adelarsq/vim-matchit) - For expanding % matching (matches start/end tags for html, for example)~~ Disabled recently as possibly unused
diff --git a/dot_config/vim/UltiSnips/python.snippets b/dot_config/vim/UltiSnips/python.snippets
deleted file mode 100644
index 014563d..0000000
--- a/dot_config/vim/UltiSnips/python.snippets
+++ /dev/null
@@ -1,10 +0,0 @@
-snippet dataclass "Create a dataclass"
-@dataclass
-class ${1:MyClass}:
-    ${0}
-endsnippet
-
-snippet forkey "Enumerate an iterable for key/value pair"
-for ${1:key}, ${2:value} in enumerate(${3}):
-    pass
-endsnippet
diff --git a/dot_config/vim/autoload/pathogen.vim b/dot_config/vim/autoload/pathogen.vim
deleted file mode 100644
index 3582fbf..0000000
--- a/dot_config/vim/autoload/pathogen.vim
+++ /dev/null
@@ -1,264 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.4
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
-" .vimrc is the only other setup necessary.
-"
-" The API is documented inline below.
-
-if exists("g:loaded_pathogen") || &cp
-  finish
-endif
-let g:loaded_pathogen = 1
-
-" Point of entry for basic default usage.  Give a relative path to invoke
-" pathogen#interpose() or an absolute path to invoke pathogen#surround().
-" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all
-" subdirectories inside "bundle" inside all directories in the runtime path.
-" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}"
-" on versions of Vim without native package support.
-function! pathogen#infect(...) abort
-  if a:0
-    let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")')
-  else
-    let paths = ['bundle/{}', 'pack/{}/start/{}']
-  endif
-  if has('packages')
-    call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"')
-  endif
-  let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$'
-  for path in filter(copy(paths), 'v:val =~# static')
-    call pathogen#surround(path)
-  endfor
-  for path in filter(copy(paths), 'v:val !~# static')
-    if path =~# '^\%([$~\\/]\|\w:[\\/]\)'
-      call pathogen#surround(path)
-    else
-      call pathogen#interpose(path)
-    endif
-  endfor
-  call pathogen#cycle_filetype()
-  if pathogen#is_disabled($MYVIMRC)
-    return 'finish'
-  endif
-  return ''
-endfunction
-
-" Split a path into a list.
-function! pathogen#split(path) abort
-  if type(a:path) == type([]) | return a:path | endif
-  if empty(a:path) | return [] | endif
-  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
-  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
-endfunction
-
-" Convert a list to a path.
-function! pathogen#join(...) abort
-  if type(a:1) == type(1) && a:1
-    let i = 1
-    let space = ' '
-  else
-    let i = 0
-    let space = ''
-  endif
-  let path = ""
-  while i < a:0
-    if type(a:000[i]) == type([])
-      let list = a:000[i]
-      let j = 0
-      while j < len(list)
-        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
-        let path .= ',' . escaped
-        let j += 1
-      endwhile
-    else
-      let path .= "," . a:000[i]
-    endif
-    let i += 1
-  endwhile
-  return substitute(path,'^,','','')
-endfunction
-
-" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
-function! pathogen#legacyjoin(...) abort
-  return call('pathogen#join',[1] + a:000)
-endfunction
-
-" Turn filetype detection off and back on again if it was already enabled.
-function! pathogen#cycle_filetype() abort
-  if exists('g:did_load_filetypes')
-    filetype off
-    filetype on
-  endif
-endfunction
-
-" Check if a bundle is disabled.  A bundle is considered disabled if its
-" basename or full name is included in the list g:pathogen_blacklist or the
-" comma delimited environment variable $VIMBLACKLIST.
-function! pathogen#is_disabled(path) abort
-  if a:path =~# '\~$'
-    return 1
-  endif
-  let sep = pathogen#slash()
-  let blacklist = get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + pathogen#split($VIMBLACKLIST)
-  if !empty(blacklist)
-    call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
-  endif
-  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
-endfunction
-
-" Prepend the given directory to the runtime path and append its corresponding
-" after directory.  Curly braces are expanded with pathogen#expand().
-function! pathogen#surround(path) abort
-  let sep = pathogen#slash()
-  let rtp = pathogen#split(&rtp)
-  let path = fnamemodify(a:path, ':s?[\\/]\=$??')
-  let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
-  let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
-  call filter(rtp, 'index(before + after, v:val) == -1')
-  let &rtp = pathogen#join(before, rtp, after)
-  return &rtp
-endfunction
-
-" For each directory in the runtime path, add a second entry with the given
-" argument appended.  Curly braces are expanded with pathogen#expand().
-function! pathogen#interpose(name) abort
-  let sep = pathogen#slash()
-  let name = a:name
-  if has_key(s:done_bundles, name)
-    return ""
-  endif
-  let s:done_bundles[name] = 1
-  let list = []
-  for dir in pathogen#split(&rtp)
-    if dir =~# '\<after$'
-      let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
-    else
-      let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction
-
-let s:done_bundles = {}
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() abort
-  let sep = pathogen#slash()
-  for glob in pathogen#split(&rtp)
-    for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
-      if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
-        silent! execute 'helptags' pathogen#fnameescape(dir)
-      endif
-    endfor
-  endfor
-endfunction
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Execute the given command.  This is basically a backdoor for --remote-expr.
-function! pathogen#execute(...) abort
-  for command in a:000
-    execute command
-  endfor
-  return ''
-endfunction
-
-" Section: Unofficial
-
-function! pathogen#is_absolute(path) abort
-  return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
-endfunction
-
-" Given a string, returns all possible permutations of comma delimited braced
-" alternatives of that string.  pathogen#expand('/{a,b}/{c,d}') yields
-" ['/a/c', '/a/d', '/b/c', '/b/d'].  Empty braces are treated as a wildcard
-" and globbed.  Actual globs are preserved.
-function! pathogen#expand(pattern, ...) abort
-  let after = a:0 ? a:1 : ''
-  let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '')
-  if pattern =~# '{[^{}]\+}'
-    let [pre, pat, post] = split(substitute(pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
-    let found = map(split(pat, ',', 1), 'pre.v:val.post')
-    let results = []
-    for pattern in found
-      call extend(results, pathogen#expand(pattern))
-    endfor
-  elseif pattern =~# '{}'
-    let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)')
-    let post = pattern[strlen(pat) : -1]
-    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
-  else
-    let results = [pattern]
-  endif
-  let vf = pathogen#slash() . 'vimfiles'
-  call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
-  return filter(results, '!empty(v:val)')
-endfunction
-
-" \ on Windows unless shellslash is set, / everywhere else.
-function! pathogen#slash() abort
-  return !exists("+shellslash") || &shellslash ? '/' : '\'
-endfunction
-
-function! pathogen#separator() abort
-  return pathogen#slash()
-endfunction
-
-" Convenience wrapper around glob() which returns a list.
-function! pathogen#glob(pattern) abort
-  let files = split(glob(a:pattern),"\n")
-  return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
-endfunction
-
-" Like pathogen#glob(), only limit the results to directories.
-function! pathogen#glob_directories(pattern) abort
-  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
-endfunction
-
-" Remove duplicates from a list.
-function! pathogen#uniq(list) abort
-  let i = 0
-  let seen = {}
-  while i < len(a:list)
-    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
-      call remove(a:list,i)
-    elseif a:list[i] ==# ''
-      let i += 1
-      let empty = 1
-    else
-      let seen[a:list[i]] = 1
-      let i += 1
-    endif
-  endwhile
-  return a:list
-endfunction
-
-" Backport of fnameescape().
-function! pathogen#fnameescape(string) abort
-  if exists('*fnameescape')
-    return fnameescape(a:string)
-  elseif a:string ==# '-'
-    return '\-'
-  else
-    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
-  endif
-endfunction
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#runtime_findfile(file,count) abort
-  let rtp = pathogen#join(1,pathogen#split(&rtp))
-  let file = findfile(a:file,rtp,a:count)
-  if file ==# ''
-    return ''
-  else
-    return fnamemodify(file,':p')
-  endif
-endfunction
-
-" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/dot_config/vim/vimrc b/dot_config/vim/vimrc
index 22e66c4..b70e947 100644
--- a/dot_config/vim/vimrc
+++ b/dot_config/vim/vimrc
@@ -53,21 +53,30 @@
     let mapleader = ","         " Leader key (default: \)
 
 " 02 - Plugin/Bundle Related
-    packadd! matchit
-    packloadall                 " Load plugins (for utilizing $XDG_CONFIG_HOME/vim/pack loading in vim 8+)
-
-    " Pathogen
-        execute pathogen#infect()
-        call pathogen#helptags() 	" generate helptags for everything in ‘runtimepath’
-
-    " Python Syntax
-        let g:python_highlight_all = 1
+    runtime! macros/matchit.vim
+
+    " Install vim-plug if doesn't exist
+    let data_dir = '$XDG_CONFIG_HOME/vim'
+    let plug_dir = data_dir . '/plugged'
+    if empty(glob(data_dir . '/autoload/plug.vim'))
+        silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+        autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+    endif
 
-    " Plugin - indentLine
-        let g:indentLine_enabled = 0    " Disable by default (messes with syntax highlighting)
+    " Load Plugins
+    call plug#begin(plug_dir)
+    Plug 'morhetz/gruvbox'
+    Plug 'itchyny/lightline.vim'
+    Plug 'preservim/nerdcommenter'
+    Plug 'scrooloose/nerdtree'
+    Plug 'vim-python/python-syntax'
+    Plug 'godlygeek/tabular'
+    Plug 'mzlogin/vim-markdown-toc'
+    Plug 'tpope/vim-surround'
+    call plug#end()
 
     " Plugin - lightline
-        if isdirectory(expand("$XDG_CONFIG_HOME/vim/bundle/lightline.vim"))
+        if isdirectory(expand(plug_dir . '/lightline.vim'))
             let g:lightline = {
                 \ 'active': {
                 \   'left': [ [ 'mode', 'paste' ],
@@ -85,10 +94,10 @@
         map _ <plug>NERDCommenterUncomment
 
     " Plugin - NERDTree related
-        if isdirectory(expand("$XDG_CONFIG_HOME/vim/bundle/nerdtree"))
+        if isdirectory(expand(plug_dir . '/nerdtree'))
             " Open NERDTree when opening nothing (just vim)
-            "autocmd StdinReadPre * let s:std_in=1
-            "autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+            autocmd StdinReadPre * let s:std_in=1
+            autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
 
             " Open NERDTree when opening directory
             autocmd StdinReadPre * let s:std_in=1
@@ -100,8 +109,11 @@
             let NERDTreeIgnore=['\\.pyc', '\\\~$', '\\.swo$', '\\.swp$', '\\.git', '\\.hg', '\\.svn', '\\.bzr']
         endif
 
+    " Plugin - python-syntax
+        let g:python_highlight_all = 1
+
     " Plugin - Tabular
-        if isdirectory(expand("$XDG_CONFIG_HOME/vim/bundle/tabular"))
+        if isdirectory(expand(plug_dir . '/tabular'))
             nmap <leader>a& :Tab /&<CR>
             vmap <leader>a& :Tab /&<CR>
             nmap <leader>a# :Tab /#<CR>
@@ -122,28 +134,6 @@
             vmap <leader>a<Bar> :Tab /<Bar><CR>
         endif
 
-    " Plugin - Vim Snippets (UltiSnips)
-        let g:UltiSnipsSnippetDirectories=["$XDG_CONFIG_HOME/vim/UltiSnips/", "UltiSnips"]    " Add custom snippets
-        let g:UltiSnipsExpandTrigger="<tab>"
-        let g:UltiSnipsListSnippets="<c-l>" " list all snippets for current filetype
-        let g:UltiSnipsJumpForwardTrigger="<c-j>"
-        let g:UltiSnipsJumpBackwardTrigger="<c-k>"
-        let g:UltiSnipsEditSplit="context"  " Split horizontally or vertically with the custom snippets
-
-    " Plugin - vim-surround
-        " This allows for surrounding test with something
-        " Note: In the following, [ will add a space around text, ] will not (e.g. [ TEST ] vs [TEST])
-        " Examples:
-        "   cs"'      " Replace double quotes with single on the current line
-        "   cs'<q class="test">    " Replace single quote with <p></p> tagging
-        "   ds"       " Remove a delimeter (double quotes)
-        "   ysiw]     " Add delimeters around current work
-        "   yss)      " Add delimeters around entire line
-        "   S(        " Add delimeters around current selected line (Shift+V)
-        "
-
-    silent! helptags ALL    " Load all helptags after plugins loaded, all messages and errors are ignored
-
 " 03 - VIM UI
     syntax on               " Enable syntax highlighting
     match ErrorMsg '\s\+$'  " Highlight spaces (makes it obvious when trailing)