diff --git a/config/astronvim/lua/user/plugins/catppuccin.lua b/config/astronvim/lua/user/plugins/catppuccin.lua
index 9b89465..c01104f 100644
--- a/config/astronvim/lua/user/plugins/catppuccin.lua
+++ b/config/astronvim/lua/user/plugins/catppuccin.lua
@@ -1,74 +1,74 @@
 return {
-  "catppuccin/nvim",
-  name = "catppuccin",
-  -- configure it
-  opts = {
-    transparent_background = true,
-    term_colors = false,
-    styles = {
-      comments = { "italic" },
-      conditionals = { "italic" },
-      loops = { "italic" },
-      functions = { "italic" },
-      keywords = { "italic" },
-      strings = { "italic" },
-      variables = { "italic" },
-      numbers = {},
-      booleans = {},
-      properties = {},
-      types = {},
-      operators = {},
-    },
-    integrations = {
-      treesitter = true,
-      native_lsp = {
-        enabled = true,
-        virtual_text = {
-          errors = { "italic" },
-          hints = { "italic" },
-          warnings = { "italic" },
-          information = { "italic" },
-        },
-        underlines = {
-          errors = { "underline" },
-          hints = { "underline" },
-          warnings = { "underline" },
-          information = { "underline" },
-        },
-      },
-      lsp_trouble = true,
-      cmp = true,
-      lsp_saga = true,
-      gitgutter = false,
-      gitsigns = true,
-      telescope = true,
-      nvimtree = {
-        enabled = true,
-        show_root = true,
-        transparent_panel = true,
-      },
-      indent_blankline = { enabled = true, colored_indent_levels = true },
-      neotree = {
-        enabled = false,
-        show_root = true,
-        transparent_panel = false,
-      },
-      dap = { enabled = true, enable_ui = false },
-      which_key = true,
-      dashboard = true,
-      neogit = true,
-      vim_sneak = false,
-      fern = false,
-      barbar = true,
-      bufferline = true,
-      markdown = true,
-      lightspeed = false,
-      ts_rainbow = true,
-      hop = false,
-      notify = true,
-      telekasten = false,
-      symbols_outline = true,
-      mini = false,
-    },
-  },
+	"catppuccin/nvim",
+	name = "catppuccin",
+	-- configure it
+	opts = {
+		transparent_background = true,
+		term_colors = false,
+		styles = {
+			comments = { "italic" },
+			conditionals = { "italic" },
+			loops = { "italic" },
+			functions = { "italic" },
+			keywords = { "italic" },
+			strings = { "italic" },
+			variables = { "italic" },
+			numbers = {},
+			booleans = {},
+			properties = {},
+			types = {},
+			operators = {},
+		},
+		integrations = {
+			treesitter = true,
+			native_lsp = {
+				enabled = true,
+				virtual_text = {
+					errors = { "italic" },
+					hints = { "italic" },
+					warnings = { "italic" },
+					information = { "italic" },
+				},
+				underlines = {
+					errors = { "underline" },
+					hints = { "underline" },
+					warnings = { "underline" },
+					information = { "underline" },
+				},
+			},
+			lsp_trouble = true,
+			cmp = true,
+			lsp_saga = true,
+			gitgutter = false,
+			gitsigns = true,
+			telescope = true,
+			nvimtree = {
+				enabled = true,
+				show_root = true,
+				transparent_panel = true,
+			},
+			indent_blankline = { enabled = true, colored_indent_levels = true },
+			neotree = {
+				enabled = false,
+				show_root = true,
+				transparent_panel = false,
+			},
+			dap = { enabled = true, enable_ui = false },
+			which_key = true,
+			dashboard = true,
+			neogit = true,
+			vim_sneak = false,
+			fern = false,
+			barbar = true,
+			bufferline = true,
+			markdown = true,
+			lightspeed = false,
+			ts_rainbow = true,
+			hop = false,
+			notify = true,
+			telekasten = false,
+			symbols_outline = true,
+			mini = false,
+		},
+	},
 }
diff --git a/config/astronvim/lua/user/plugins/harpoon.lua b/config/astronvim/lua/user/plugins/harpoon.lua
index db6d70c..48c7fa4 100644
--- a/config/astronvim/lua/user/plugins/harpoon.lua
+++ b/config/astronvim/lua/user/plugins/harpoon.lua
@@ -1,68 +1,69 @@
 return {
-  "ThePrimeagen/harpoon",
-  config = function()
-    require("harpoon").setup({
-      global_settings = {
-        -- sets the marks upon calling `toggle` on the ui, instead of require `:w`.
-        save_on_toggle = true,
+	"ThePrimeagen/harpoon",
+	lazy = false,
+	config = function()
+		require("harpoon").setup({
+			global_settings = {
+				-- sets the marks upon calling `toggle` on the ui, instead of require `:w`.
+				save_on_toggle = true,
 
-        -- saves the harpoon file upon every change. disabling is unrecommended.
-        save_on_change = true,
+				-- saves the harpoon file upon every change. disabling is unrecommended.
+				save_on_change = true,
 
-        -- sets harpoon to run the command immediately as it's passed to the terminal when calling `sendCommand`.
-        enter_on_sendcmd = true,
+				-- sets harpoon to run the command immediately as it's passed to the terminal when calling `sendCommand`.
+				enter_on_sendcmd = true,
 
-        -- closes any tmux windows harpoon that harpoon creates when you close Neovim.
-        tmux_autoclose_windows = false,
+				-- closes any tmux windows harpoon that harpoon creates when you close Neovim.
+				tmux_autoclose_windows = false,
 
-        -- filetypes that you want to prevent from adding to the harpoon list menu.
-        excluded_filetypes = { "harpoon" },
+				-- filetypes that you want to prevent from adding to the harpoon list menu.
+				excluded_filetypes = { "harpoon" },
 
-        -- set marks specific to each git branch inside git repository
-        mark_branch = false,
-      },
-      projects = {
-        -- Yes $HOME works
-        ["$HOME/personal/vim-with-me/server"] = {
-          term = {
-            cmds = {
-              "./env && npx ts-node src/index.ts",
-            },
-          },
-        },
-      },
-    })
+				-- set marks specific to each git branch inside git repository
+				mark_branch = false,
+			},
+			projects = {
+				-- Yes $HOME works
+				["$HOME/personal/vim-with-me/server"] = {
+					term = {
+						cmds = {
+							"./env && npx ts-node src/index.ts",
+						},
+					},
+				},
+			},
+		})
 
-    local mark = require("harpoon.mark")
-    local ui = require("harpoon.ui")
-    local telescope = require("telescope")
+		local mark = require("harpoon.mark")
+		local ui = require("harpoon.ui")
+		local telescope = require("telescope")
 
-    telescope.load_extension("harpoon")
+		telescope.load_extension("harpoon")
 
-    local function map(key, func, desc)
-      vim.keymap.set("n", "<leader><leader>" .. key, func, { desc = desc })
-    end
+		local function map(key, func, desc)
+			vim.keymap.set("n", "<leader><leader>" .. key, func, { desc = desc })
+		end
 
-    map("n", mark.add_file, "Add mark")
+		map("n", mark.add_file, "Add mark")
 
-    map("t", ui.toggle_quick_menu, "Toogle UI")
+		map("t", ui.toggle_quick_menu, "Toogle UI")
 
-    map("j", function()
-      ui.nav_file(1)
-    end, "Navigate to file 1")
+		map("j", function()
+			ui.nav_file(1)
+		end, "Navigate to file 1")
 
-    map("k", function()
-      ui.nav_file(2)
-    end, "Navigate to file 2")
+		map("k", function()
+			ui.nav_file(2)
+		end, "Navigate to file 2")
 
-    map("l", function()
-      ui.nav_file(3)
-    end, "Navigate to file 3")
+		map("l", function()
+			ui.nav_file(3)
+		end, "Navigate to file 3")
 
-    map("ñ", function()
-      ui.nav_file(4)
-    end, "Navigate to file 4")
+		map("ñ", function()
+			ui.nav_file(4)
+		end, "Navigate to file 4")
 
-    map("T", "<CMD>Telescope harpoon marks<CR>", "Open marks in telescope")
-  end,
+		map("T", "<CMD>Telescope harpoon marks<CR>", "Open marks in telescope")
+	end,
 }
diff --git a/config/astronvim/lua/user/plugins/init.lua b/config/astronvim/lua/user/plugins/init.lua
index d0d8aa2..4b4757c 100644
--- a/config/astronvim/lua/user/plugins/init.lua
+++ b/config/astronvim/lua/user/plugins/init.lua
@@ -36,4 +36,26 @@ return {
 			})
 		end,
 	},
+	{
+		"chrisgrieser/nvim-various-textobjs",
+		lazy = false,
+		opts = { useDefaultKeymaps = true },
+	},
+	{
+		"RRethy/nvim-treesitter-textsubjects",
+		lazy = false,
+		config = function()
+			require("nvim-treesitter.configs").setup({
+				textsubjects = {
+					enable = true,
+					prev_selection = ",", -- (Optional) keymap to select the previous selection
+					keymaps = {
+						["."] = "textsubjects-smart",
+						[";"] = "textsubjects-container-outer",
+						["i;"] = "textsubjects-container-inner",
+					},
+				},
+			})
+		end,
+	},
 }
diff --git a/config/astronvim/lua/user/plugins/mason-null-ls.lua b/config/astronvim/lua/user/plugins/mason-null-ls.lua
index 571cf5e..b544456 100644
--- a/config/astronvim/lua/user/plugins/mason-null-ls.lua
+++ b/config/astronvim/lua/user/plugins/mason-null-ls.lua
@@ -8,7 +8,6 @@ return {
 			"fixjson",
 			"gitlint",
 			"intelephense",
-			"luacheck",
 			"markdownlint",
 			"php-cs-fixer",
 			"prettierd",
diff --git a/config/astronvim/lua/user/plugins/nvim-spider.lua b/config/astronvim/lua/user/plugins/nvim-spider.lua
new file mode 100644
index 0000000..2bbb0d6
--- /dev/null
+++ b/config/astronvim/lua/user/plugins/nvim-spider.lua
@@ -0,0 +1,10 @@
+return {
+	"chrisgrieser/nvim-spider",
+	event = "VeryLazy",
+	config = function()
+		vim.keymap.set({ "n", "o", "x" }, "w", "<cmd>lua require('spider').motion('w')<CR>", { desc = "Spider-w" })
+		vim.keymap.set({ "n", "o", "x" }, "e", "<cmd>lua require('spider').motion('e')<CR>", { desc = "Spider-e" })
+		vim.keymap.set({ "n", "o", "x" }, "b", "<cmd>lua require('spider').motion('b')<CR>", { desc = "Spider-b" })
+		vim.keymap.set({ "n", "o", "x" }, "ge", "<cmd>lua require('spider').motion('ge')<CR>", { desc = "Spider-ge" })
+	end,
+}