diff --git a/nvim/.config/nvim/after/plugin/nvim-autopairs.lua b/nvim/.config/nvim/after/plugin/nvim-autopairs.lua
new file mode 100644
index 0000000..ba62d44
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/nvim-autopairs.lua
@@ -0,0 +1 @@
+require("nvim-autopairs").setup {}
diff --git a/nvim/.config/nvim/after/plugin/pqf.lua b/nvim/.config/nvim/after/plugin/pqf.lua
new file mode 100644
index 0000000..a551a8d
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/pqf.lua
@@ -0,0 +1 @@
+require('pqf').setup()
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 39d00f6..12f60bd 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -116,6 +116,7 @@ require 'plugins'
 require 'autocmd'
 require 'keymappings'
 require 'lsp'
+require 'treesitter'
 
 -- Load our custom color scheme
 vim.cmd.colorscheme('yolokai')
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 3c47bf6..4d87837 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -1,96 +1,46 @@
 -- Add the in built Cfilter plugin. Replaces QFGrep.
 vim.cmd 'packadd cfilter'
-vim.cmd 'packadd packer.nvim'
 
 local init = function ()
-  use {'wbthomason/packer.nvim', opt = true}
-  -- Vertical Motion
-  use 'phaazon/hop.nvim'
-  -- Search
   use {
-    'junegunn/fzf',
-    run = './install --bin'
+    'wbthomason/packer.nvim'                          ,
+    'phaazon/hop.nvim'                                ,
+    'junegunn/fzf'                                    ,
+    'junegunn/fzf.vim'                                ,
+    'rmagatti/auto-session'                           ,
+    'dcampos/nvim-snippy'                             ,
+    'honza/vim-snippets'                              ,
+    'lewis6991/gitsigns.nvim'                         ,
+    'tpope/vim-fugitive'                              ,
+    'https://github.com/SanchayanMaity/gitlinker.nvim',
+    'vim-utils/vim-husk'                              ,
+    'chengzeyi/fzf-preview.vim'                       ,
+    'https://gitlab.com/yorickpeterse/nvim-pqf'       ,
+    'wellle/targets.vim'                              ,
+    'tpope/vim-surround'                              ,
+    'kana/vim-textobj-user'                           ,
+    'idbrii/textobj-word-column.vim'                  ,
+    'glts/vim-textobj-comment'                        ,
+    'numToStr/Comment.nvim'                           ,
+    'tpope/vim-repeat'                                ,
+    'tpope/vim-sleuth'                                ,
+    'tpope/vim-dispatch'                              ,
+    'elihunter173/dirbuf.nvim'                        ,
+    'junegunn/vim-easy-align'                         ,
+    'nvim-lua/plenary.nvim'                           ,
+    'kosayoda/nvim-lightbulb'                         ,
+    'mfussenegger/nvim-lint'                          ,
+    'lvimuser/lsp-inlayhints.nvim'                    ,
+    'sdiehl/vim-cabalfmt'                             ,
+    'nvim-treesitter/nvim-treesitter'                 ,
+    'nvim-treesitter/playground'                      ,
+    'mfussenegger/nvim-treehopper'                    ,
+    'chentoast/marks.nvim'                            ,
+    'andymass/vim-matchup'                            ,
+    'christoomey/vim-tmux-navigator'                  ,
+    'windwp/nvim-autopairs'                           ,
+    'gpanders/nvim-parinfer'
   }
-  use 'junegunn/fzf.vim'
-  -- Manage Project sessions
-  use 'rmagatti/auto-session'
-  -- Snippets
-  use {
-    'dcampos/nvim-snippy',
-    requires = {
-      'honza/vim-snippets',
-    }
-  }
-  -- Git support
-  use 'lewis6991/gitsigns.nvim'
-  use 'tpope/vim-fugitive'
-  use 'https://github.com/SanchayanMaity/gitlinker.nvim'
-  -- Boost vim command line mode
-  use 'vim-utils/vim-husk'
-  -- Quickfix
-  use 'chengzeyi/fzf-preview.vim'
-  use {
-    'https://gitlab.com/yorickpeterse/nvim-pqf',
-    config = function()
-      require('pqf').setup()
-    end
-  }
-  -- Text Object plugins
-  use {
-    'wellle/targets.vim',
-    'tpope/vim-surround',
-    'kana/vim-textobj-user',
-    'idbrii/textobj-word-column.vim',
-    'glts/vim-textobj-comment'
-  }
-  use 'numToStr/Comment.nvim'
-  -- Tim pope essentials
-  use {
-    'tpope/vim-repeat',
-    'tpope/vim-sleuth',
-    'tpope/vim-dispatch'
-  }
-  -- Directory viewer
-  use 'elihunter173/dirbuf.nvim'
-  -- Alignment
-  use 'junegunn/vim-easy-align'
-  use 'nvim-lua/plenary.nvim'
-  -- LSP
-  use 'kosayoda/nvim-lightbulb'
-  -- Language support & syntax highlighting
-  use 'mfussenegger/nvim-lint'
-  use 'lvimuser/lsp-inlayhints.nvim'
-  use 'sdiehl/vim-cabalfmt'
-  -- treesitter based syntax highlighting
-  use {
-    'nvim-treesitter/nvim-treesitter',
-    requires = {
-      {
-        "nvim-treesitter/playground",
-        after = "nvim-treesitter",
-        cmd   = { "TSPlaygroundToggle", "TSHighlightCapturesUnderCursor" },
-      },
-      {
-        "mfussenegger/nvim-treehopper",
-        after = "nvim-treesitter",
-      },
-    },
-    config = "require('treesitter')",
-    run    = ':TSUpdate'
-  }
-  -- Marks and registers
-  use {
-    'chentoast/marks.nvim',
-  }
-  use 'andymass/vim-matchup'
-  use 'christoomey/vim-tmux-navigator'
-  use {
-    "windwp/nvim-autopairs",
-    config = function()
-      require("nvim-autopairs").setup {}
-    end
-  }
-  use 'gpanders/nvim-parinfer'
 end
 
 local config = {
@@ -102,4 +52,4 @@ local config = {
   }
 }
 
-return require('packer').startup(init, config)
+require('packer').startup(init, config)
diff --git a/nvim/.local/share/nvim/site/pack/packer/opt/packer.nvim b/nvim/.local/share/nvim/site/pack/packer/opt/packer.nvim
deleted file mode 160000
index 1d0cf98..0000000
--- a/nvim/.local/share/nvim/site/pack/packer/opt/packer.nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1d0cf98a561f7fd654c970c49f917d74fafe1530