diff --git a/chezmoi/dot_config/nvim/lua/aleidk/options.lua b/chezmoi/dot_config/nvim/lua/aleidk/options.lua
index f9f573a..5facef5 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/options.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/options.lua
@@ -27,7 +27,7 @@ opt.number = true -- Print line number
 opt.pumblend = 10 -- Popup blend
 opt.pumheight = 10 -- Maximum number of entries in a popup
 opt.relativenumber = true -- Relative line numbers
-opt.scrolloff = 1000 -- Lines of context
+opt.scrolloff = 15 -- Lines of context
 opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" }
 opt.shiftround = true -- Round indent
 opt.shiftwidth = 2 -- Size of an indent
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/ai.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/ai.lua
index 8cdadc0..db4d307 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/ai.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/ai.lua
@@ -1,6 +1,5 @@
 return {
 	"jackMort/ChatGPT.nvim",
-	event = "VeryLazy",
 	opts = {
 		api_key_cmd = nil,
 		yank_register = "+",
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/colorscheme.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/colorscheme.lua
index cda161e..cf520d8 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/colorscheme.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/colorscheme.lua
@@ -8,7 +8,7 @@ return { -- Change colors.none if not using a transparent background
 		integrations = {
 			cmp = true,
 			notify = true,
-			harpoon = true,
+			harpoon = false,
 			mason = true,
 			neogit = true,
 			noice = true,
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/comments.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/comments.lua
index e7f8fc4..132a231 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/comments.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/comments.lua
@@ -33,7 +33,7 @@ return {
 	},
 	{
 		"danymat/neogen",
-		config = { snippet_engine = "luasnip" },
+		opts = { snippet_engine = "luasnip" },
 		dependencies = { "nvim-treesitter/nvim-treesitter" },
 		version = "*", -- stable releases
 		keys = {
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua
index fc75c77..935f9b4 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua
@@ -60,7 +60,6 @@ return {
 			"nvim-lua/plenary.nvim", -- required
 			"nvim-telescope/telescope.nvim", -- optional
 			"sindrets/diffview.nvim", -- optional
-			"ibhagwan/fzf-lua", -- optional
 		},
 		config = true,
 		opts = {
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua
index a9f418b..a80c6ef 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua
@@ -1,6 +1,7 @@
 return {
 	-- Detect tabstop and shiftwidth automatically
 	"tpope/vim-sleuth",
+	{ "nvim-tree/nvim-web-devicons", lazy = true },
 	{
 		"mbbill/undotree",
 		config = function()
@@ -23,6 +24,7 @@ return {
 	},
 	{ "nvim-treesitter/nvim-treesitter-context" },
 	{
+		-- Color Picker
 		"uga-rosa/ccc.nvim",
 		event = "VeryLazy",
 		opts = {
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua
index 39c02ce..b4bad99 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua
@@ -1,6 +1,7 @@
 return {
 	-- LSP Configuration & Plugins
 	"neovim/nvim-lspconfig",
+	event = { "BufReadPost", "BufNewFile", "BufWritePre" },
 	dependencies = {
 		-- Automatically install LSPs to stdpath for neovim
 		{ "williamboman/mason.nvim" },
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua
index edb1780..d8afb1e 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/mason.lua
@@ -1,5 +1,8 @@
 return {
 	"williamboman/mason.nvim",
+	cmd = "Mason",
+	keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
+	build = ":MasonUpdate",
 	opts = {
 		ensure_installed = {
 			"eslint_d",
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/quickfix.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/quickfix.lua
index af1a80b..7ce267a 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/quickfix.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/quickfix.lua
@@ -2,14 +2,7 @@ return {
 	{
 		"kevinhwang91/nvim-bqf",
 		event = "VeryLazy",
-		dependencies = {
-			{
-				"junegunn/fzf",
-				build = function()
-					vim.fn["fzf#install"]()
-				end,
-			},
-		},
+		dependencies = {},
 		config = function()
 			local fn = vim.fn
 
diff --git a/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua b/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua
index fd0516a..e6c8a81 100644
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/treesitter.lua
@@ -1,6 +1,7 @@
 return {
 	-- Highlight, edit, and navigate code
 	"nvim-treesitter/nvim-treesitter",
+	event = { "BufReadPost", "BufNewFile", "BufWritePre", "VeryLazy" },
 	dependencies = {
 		"nvim-treesitter/nvim-treesitter-textobjects",
 		"windwp/nvim-ts-autotag",