diff --git a/.luarc.json b/.luarc.json
deleted file mode 100644
index f83c376..0000000
--- a/.luarc.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
-  "runtime.version": "LuaJIT",
-  "hint.enable": false,
-	"workspace.library": ["/home/fey/.config/nvim"]
-}
diff --git a/init.lua b/init.lua
index e9a2926..5b5288a 100644
--- a/init.lua
+++ b/init.lua
@@ -1,4 +1,4 @@
-require 'plugins'
+vim.loader.enable()
 
 if vim.g.neovide then
 	require 'neovide'
diff --git a/lazy-lock.json b/lazy-lock.json
index ba4fffe..95628ce 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -34,7 +34,6 @@
   "nvim-lspconfig": { "branch": "master", "commit": "bdbc65aadc708ce528efb22bca5f82a7cca6b54d" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-test": { "branch": "main", "commit": "e06f3d029ee161f3ead6193cf27354d1eb8723c3" },
   "nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
   "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 2552a65..3745e68 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -24,6 +24,7 @@ return {
 	{
 		'sainnhe/everforest',
 		init = function()
+			vim.g.everforest_better_performance = 1
 			vim.g.everforest_dim_inactive_windows = 1
 		end,
 		config = function() vim.cmd [[colorscheme everforest]] end
@@ -35,19 +36,23 @@ return {
 		dependencies = { 'rafamadriz/friendly-snippets' },
 		config = function()
 			require('luasnip.loaders.from_vscode').lazy_load()
-		end
+		end,
+		ft = { 'lua' }
 	},
-	'saadparwaiz1/cmp_luasnip',
-	'hrsh7th/cmp-nvim-lsp',
-	'hrsh7th/cmp-buffer',
-	'hrsh7th/cmp-path',
-	'hrsh7th/cmp-cmdline',
 	{
 		'hrsh7th/nvim-cmp',
-		config = function() require 'cmp-setup' end
+		config = function() require 'cmp-setup' end,
+		event = 'VeryLazy',
+		dependencies = {
+			'saadparwaiz1/cmp_luasnip',
+			'hrsh7th/cmp-nvim-lsp',
+			'hrsh7th/cmp-buffer',
+			'hrsh7th/cmp-path',
+			'hrsh7th/cmp-cmdline',
+		}
 	},
 	'lukas-reineke/cmp-under-comparator',
-	{ 'neovim/nvim-lspconfig', config = function() require 'lsp-setup' end },
+	{ 'neovim/nvim-lspconfig', config = function() require 'lsp-setup' end, event = 'VeryLazy' },
 	{
 		'folke/neodev.nvim',
 		opts = {
@@ -85,19 +90,22 @@ return {
 			'sindrets/diffview.nvim',
 		},
 		config = true,
+		cmd = { 'Neogit' }
 	},
 	{
 		'ahmedkhalf/project.nvim',
 		opts = {},
 		config = function(_, opts)
 			require 'gitsigns'.setup(opts)
-		end
+		end,
+		event = 'VeryLazy'
 	},
 	'lambdalisue/suda.vim',
 	{
 		'kylechui/nvim-surround',
 		version = '*',
-		opts = {}
+		opts = {},
+		cmd = { 'SudaRead', 'SudaWrite' }
 	},
 	{
 		'nvim-treesitter/nvim-treesitter',
@@ -129,12 +137,6 @@ return {
 		},
 		lazy = false
 	},
-	{
-		'klen/nvim-test',
-		config = function()
-			require('nvim-test').setup()
-		end
-	},
 	'direnv/direnv.vim',
 	{
 		'folke/which-key.nvim',
@@ -196,6 +198,7 @@ return {
 			})
 		end,
 		enabled = hasversion(0, 10),
+		event = 'VeryLazy'
 	},
 	{
 		'folke/trouble.nvim',
@@ -238,7 +241,8 @@ return {
 		'lewis6991/gitsigns.nvim',
 		opts = {
 			current_line_blame = true
-		}
+		},
+		event = 'VeryLazy'
 	},
 	{
 		'folke/zen-mode.nvim',
@@ -256,7 +260,8 @@ return {
 	},
 	{
 		'folke/twilight.nvim',
-		opts = {}
+		opts = {},
+		cmd = { 'Twilight', 'TwilightEnable', 'TwilightDisable' }
 	},
 	{
 		'CWood-sdf/spaceport.nvim',
diff --git a/lua/plugins/editing.lua b/lua/plugins/editing.lua
index 3e12c8d..2bfe1e9 100644
--- a/lua/plugins/editing.lua
+++ b/lua/plugins/editing.lua
@@ -6,7 +6,8 @@ return {
 	},
 	{
 		'windwp/nvim-ts-autotag',
-		opts = {}
+		opts = {},
+		ft = 'html'
 	},
 	{
 		'RRethy/nvim-treesitter-endwise',
@@ -16,7 +17,10 @@ return {
 					enable = true,
 				},
 			}
-		end
+		end,
+		ft = {
+			'lua', 'ruby', 'julia'
+		}
 	},
 	{
 		"utilyre/sentiment.nvim",
diff --git a/lua/plugins/rust.lua b/lua/plugins/rust.lua
index 6452d2b..ea2ba67 100644
--- a/lua/plugins/rust.lua
+++ b/lua/plugins/rust.lua
@@ -5,5 +5,6 @@ return {
 		config = function()
 			require('crates').setup()
 		end,
+		ft = 'rust'
 	}
 }
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index eda5f1c..701fb67 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -20,5 +20,6 @@ return {
 	{
 		'stevearc/dressing.nvim',
 		opts = {},
+		event = 'VeryLazy'
 	}
 }
diff --git a/lua/plugins/test.lua b/lua/plugins/test.lua
index c138ba5..dca66b0 100644
--- a/lua/plugins/test.lua
+++ b/lua/plugins/test.lua
@@ -20,10 +20,14 @@ return {
 			'antoinemadec/FixCursorHold.nvim',
 			'nvim-treesitter/nvim-treesitter',
 			'nvim-neotest/neotest-jest'
+		},
+		keys = {
+			{ '<leader>tt', function() require("neotest").run.run() end }
 		}
 	},
 	{
 		'andythigpen/nvim-coverage',
-		dependencies = { 'nvim-lua/plenary.nvim' }
+		dependencies = { 'nvim-lua/plenary.nvim' },
+		event = 'VeryLazy'
 	}
 }