diff --git a/after/plugin/autoclose.lua b/after/plugin/autoclose.lua
deleted file mode 100644
index 82cbf13..0000000
--- a/after/plugin/autoclose.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local autoclose = require("autoclose")
-
-autoclose.setup({
-    keys = {
-        ["<"] = { escape = false, close = true, pair = "<>" },
-    }
-})
diff --git a/after/plugin/bufferline.lua b/after/plugin/bufferline.lua
index 80ab0e8..7afbf94 100644
--- a/after/plugin/bufferline.lua
+++ b/after/plugin/bufferline.lua
@@ -1,4 +1,7 @@
-local bufferline = require("bufferline")
+local setup, bufferline = pcall(require, "bufferline")
+if not setup then
+    return
+end
 
 bufferline.setup {
     options = {
diff --git a/after/plugin/comment.lua b/after/plugin/comment.lua
index 08fb785..a1a210c 100644
--- a/after/plugin/comment.lua
+++ b/after/plugin/comment.lua
@@ -1,4 +1,7 @@
-local comment = require("Comment")
+local setup, comment = pcall(require, "Comment")
+if not setup then
+    return
+end
 
 comment.setup({
     padding = true,
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index b1cd8be..4c4be2f 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -1,4 +1,5 @@
 local lsp = require('lsp-zero').preset({})
+local lspconfig = require('lspconfig')
 
 lsp.on_attach(function(client, bufnr)
     lsp.default_keymaps({buffer = bufnr})
@@ -35,6 +36,7 @@ lsp.ensure_installed({
     'tsserver',
     'rust_analyzer',
 })
-require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
+lspconfig.lua_ls.setup(lsp.nvim_lua_ls())
+lspconfig.tsserver.setup({})
 
 lsp.setup()
diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua
index 56c426a..e8a9c6e 100644
--- a/after/plugin/lualine.lua
+++ b/after/plugin/lualine.lua
@@ -1,4 +1,9 @@
-require('lualine').setup {
+local setup, lualine = pcall(require, 'lualine')
+if not setup then
+  return
+end
+
+lualine.setup {
   options = {
     icons_enabled = true,
     theme = 'auto',
diff --git a/after/plugin/neogit.lua b/after/plugin/neogit.lua
index 28a5bb1..d9ebd40 100644
--- a/after/plugin/neogit.lua
+++ b/after/plugin/neogit.lua
@@ -1,4 +1,7 @@
-local neogit = require("neogit")
+local setup, neogit = pcall(require, "neogit")
+if not setup then
+    return
+end
 
 neogit.setup {
     auto_refresh = true,
diff --git a/after/plugin/nvimcord.lua b/after/plugin/nvimcord.lua
index 11be8e2..41b6a2c 100644
--- a/after/plugin/nvimcord.lua
+++ b/after/plugin/nvimcord.lua
@@ -1,4 +1,9 @@
-require('nvimcord').setup {
+local setup, nvimcord = pcall(require, 'nvimcord')
+if not setup then
+    return
+end
+
+nvimcord.setup {
     autostart = true,
     client_id = '954365489214291979',
     large_file_icon = true,
diff --git a/after/plugin/nvimtree.lua b/after/plugin/nvimtree.lua
index 63808ac..d6ab493 100644
--- a/after/plugin/nvimtree.lua
+++ b/after/plugin/nvimtree.lua
@@ -1,4 +1,7 @@
-local nvimtree = require("nvim-tree")
+local setup, nvimtree = pcall(require, "nvim-tree")
+if not setup then
+    return
+end
 
 nvimtree.setup({
 	view = {
diff --git a/after/plugin/presence.lua b/after/plugin/presence.lua
index 4ecaf0a..c3ce0e2 100644
--- a/after/plugin/presence.lua
+++ b/after/plugin/presence.lua
@@ -1,4 +1,9 @@
-require("presence").setup({
+local setup, presence = pcall(require, "presence")
+if not setup then
+    return
+end
+
+presence.setup({
 
     auto_update        = true,
     neovim_image_text  = "The One True Text Editor",
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
index 770365a..27e753d 100644
--- a/after/plugin/telescope.lua
+++ b/after/plugin/telescope.lua
@@ -1,5 +1,13 @@
-local builtin = require('telescope.builtin')
-local telescope = require('telescope')
+local telescope_setup, telescope = pcall(require, 'telescope')
+if not telescope_setup then
+    return
+end
+
+local builtin_setup, builtin = pcall(require, 'telescope.builtin')
+if not builtin_setup then
+    return
+end
+
 telescope.load_extension('file_browser')
 telescope.load_extension('project')
 
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
index 0b06c8d..c668dd2 100644
--- a/after/plugin/treesitter.lua
+++ b/after/plugin/treesitter.lua
@@ -1,5 +1,10 @@
-require'nvim-treesitter.configs'.setup {
-  ensure_installed = { "lua", "vim", "vimdoc", "javascript", "java" },
+local status, treesitter = pcall(require, "nvim-treesitter.configs")
+if not status then
+    return
+end
+
+treesitter.setup {
+  ensure_installed = { "lua", "vim", "vimdoc", "javascript", "java", "json" },
   sync_install = false,
   auto_install = true,