diff --git a/init.lua b/init.lua
index 9f19978..6711935 100644
--- a/init.lua
+++ b/init.lua
@@ -8,11 +8,9 @@ require("user.navic")
 require("user.cmp")
 require("user.lsp")
 require("user.telescope")
-require("user.treesitter")
 require("user.autopairs")
 require("user.comment")
 require("user.gitsigns")
-require("user.nvimtree")
 require("user.bufferline")
 require("user.whitespace")
 require("user.lualine")
diff --git a/lua/user/lsp/virtuallines.lua b/lua/user/lsp/virtuallines.lua
index b10ab7a..e3bbe41 100644
--- a/lua/user/lsp/virtuallines.lua
+++ b/lua/user/lsp/virtuallines.lua
@@ -3,7 +3,7 @@ if not status_ok then
 	return
 end
 
-lines.register_lsp_virtual_lines()
+lines.setup()
 
 vim.diagnostic.config({
 	virtual_text = false,
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index b8c4a5c..bef12a8 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -115,7 +115,14 @@ return packer.startup(function(use)
 	use("lewis6991/gitsigns.nvim")
 
 	-- Nvim-Tree
-	use("kyazdani42/nvim-tree.lua")
+	use({
+		"kyazdani42/nvim-tree.lua",
+		opt = true,
+		cmd = { "NvimTreeToggle", "NvimTreeClose" },
+		config = function()
+			require("user.nvimtree")
+		end,
+	})
 
 	-- Bufferline
 	use("akinsho/bufferline.nvim")