diff --git a/lazy-lock.json b/lazy-lock.json
index f2c2a5e..90d4d9a 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,58 +1,58 @@
 {
-  "AstroNvim": { "branch": "main", "commit": "2bb2fa9a01311ae7f9bfebf7b3ae996bcc4717be" },
+  "AstroNvim": { "branch": "main", "commit": "55a2b084eabe880c4ffa377f82bb972caec57e09" },
   "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
-  "aerial.nvim": { "branch": "master", "commit": "deed64693123b45a4e82590cb9b2eb45ea5fd159" },
+  "aerial.nvim": { "branch": "master", "commit": "6ab1a0ce4874d21610fc5a67a6c82c7b943c635b" },
   "astrocore": { "branch": "main", "commit": "c797dd5a592e2bd154f2503e231b8a4083659534" },
-  "astrolsp": { "branch": "main", "commit": "414775e4b49a46bd7105cc5498ea7bb312359bf2" },
-  "astrotheme": { "branch": "main", "commit": "0a3fb361f1e3d6a0cbb42e93f3d01fb5203b6752" },
+  "astrolsp": { "branch": "main", "commit": "0befe28a4ea96e46b7f7c01e4a634c04225ba55a" },
+  "astrotheme": { "branch": "main", "commit": "4a2af93815e4e6adfe69c836e46047a9451de858" },
   "astroui": { "branch": "main", "commit": "4943abbd42674b43249313afe83b91065a40e4be" },
   "auto-save.nvim": { "branch": "main", "commit": "37c82fd548e3f5ffc2d9d020a65dac1044584f44" },
-  "bamboo.nvim": { "branch": "master", "commit": "56c924d0cbd3a37f9d0ea1235a189a3cccde1f44" },
+  "bamboo.nvim": { "branch": "master", "commit": "6ec224a4fcf0970fce262fc5bb51048721d464f6" },
   "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
-  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
-  "copilot.vim": { "branch": "release", "commit": "f3d66c148aa60ad04c0a21d3e0a776459de09eb2" },
-  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
+  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
+  "copilot.vim": { "branch": "release", "commit": "da369d90cfd6c396b1d0ec259836a1c7222fb2ea" },
+  "flash.nvim": { "branch": "main", "commit": "3be9bf7e85550045ec576379a0c45aac144d0438" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
   "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
+  "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" },
+  "lazydev.nvim": { "branch": "main", "commit": "01bc2aacd51cf9021eb19d048e70ce3dd09f7f93" },
   "lsp_signature.nvim": { "branch": "master", "commit": "62cadce83aaceed677ffe7a2d6a57141af7131ea" },
+  "markview.nvim": { "branch": "main", "commit": "c93ea99d96b4bfda5b7c7d0dfca9c26edf6e78f0" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
-  "mason.nvim": { "branch": "main", "commit": "197f6352c276bbc2d25541dfce00ec50d1a4e88f" },
+  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
   "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mini.move": { "branch": "main", "commit": "819e90c3e113a3c826c3003ec07073f1e0677ea0" },
-  "multiple-cursors.nvim": { "branch": "main", "commit": "1ac15d047a4b265cc2389957bcc56ee561b29e02" },
-  "neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" },
-  "neoconf.nvim": { "branch": "main", "commit": "5aeca07ecb2f506d32e81eb82b0ed384ac2a53c5" },
-  "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" },
-  "none-ls.nvim": { "branch": "main", "commit": "5fcb73913a9290f78097e34420fe0e6130c5c33c" },
+  "mini.move": { "branch": "main", "commit": "f33406ae7d95b931c6a0d3ba11e50983fe800afb" },
+  "neo-tree.nvim": { "branch": "main", "commit": "8cdd6b1940f333c1dd085526a9c45b30fb2dbf50" },
+  "neoconf.nvim": { "branch": "main", "commit": "7a8d7fd36f95f5cbbf57d4a5c463f6c54ad54cd3" },
+  "none-ls-extras.nvim": { "branch": "main", "commit": "402c6b5c29f0ab57fac924b863709f37f55dc298" },
+  "none-ls.nvim": { "branch": "main", "commit": "6617d47fbf275d197e3335022a3d33ff310a4b93" },
   "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-dap": { "branch": "master", "commit": "a479e25ed5b5d331fb46ee4b9e160ff02ac64310" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "1ce0a09bfc28c7274e649d20927cea51e440b65c" },
-  "nvim-lsp-endhints": { "branch": "main", "commit": "f977426055fc6b5c6449b416e08e2462f59b9317" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "e0c4a58ec8c3ca7c92d3ee4eb3bc1dd0f7be317e" },
+  "nvim-lsp-endhints": { "branch": "main", "commit": "d4ea1bf2dcbe1c4d522e2c06953988993a9acdf1" },
   "nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" },
-  "nvim-spider": { "branch": "main", "commit": "53ba761cd40c1d683e8477d138ff03cd7e6e384a" },
+  "nvim-spider": { "branch": "main", "commit": "a7705d7233ac3c47f7a1e80172bbeaa11f1c722f" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "ec308c7827b5f8cb2dd0ad303a059c945dd21969" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
-  "nvim_context_vt": { "branch": "master", "commit": "b69f642f7848fec8c056a7e2c9452e3dec84c2b5" },
+  "nvim_context_vt": { "branch": "master", "commit": "fadbd9e57af72f6df3dd33df32ee733aa01cdbc0" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
   "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" },
-  "snacks.nvim": { "branch": "main", "commit": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed" },
+  "snacks.nvim": { "branch": "main", "commit": "fc84ed42a44247a99846f6e8d87f0482f15c1787" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "e65731d50c548c020f3961bb42071671f0fa923c" },
+  "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "6a51446c2c8f09a7c207d2dc2aaa5bbbda36e093" },
   "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
   "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
   "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }
diff --git a/lua/plugins/astrolsp.lua b/lua/plugins/astrolsp.lua
index fa50ee3..f39aa30 100644
--- a/lua/plugins/astrolsp.lua
+++ b/lua/plugins/astrolsp.lua
@@ -3,158 +3,150 @@
 --       as this provides autocomplete and documentation while editing
 ---@type LazySpec
 return {
-	"AstroNvim/astrolsp",
-	---@type AstroLSPOpts
-	opts = {
-		-- Configuration table of features provided by AstroLSP
-		features = {
-			autoformat = false, -- enable or disable auto formatting on start
-			codelens = true, -- enable/disable codelens refresh on start
-			inlay_hints = false, -- enable/disable inlay hints on start
-			semantic_tokens = true, -- enable/disable semantic token highlighting
-		},
-		-- customize lsp formatting options
-		formatting = require("plugins.configs.lsp.formatting"),
-		-- enable servers that you already have installed without mason
+  "AstroNvim/astrolsp",
+  ---@type AstroLSPOpts
+  opts = {
+    -- Configuration table of features provided by AstroLSP
+    features = {
+      autoformat = false, -- enable or disable auto formatting on start
+      codelens = true, -- enable/disable codelens refresh on start
+      inlay_hints = false, -- enable/disable inlay hints on start
+      semantic_tokens = true, -- enable/disable semantic token highlighting
+    },
+    -- customize lsp formatting options
+    formatting = require "plugins.configs.lsp.formatting",
+    -- enable servers that you already have installed without mason
 
-		servers = {},
-		-- customize language server configuration options passed to `lspconfig`
-		---@diagnostic disable: missing-fields
-		config = {
-			-- clangd = require "plugins.configs.lsp.config.clangd",
-			basedpyright = require("plugins.configs.lsp.config.basedpyright"),
-			jedi_language_server = require("plugins.configs.lsp.config.jedi_language"),
-			pyright = require("plugins.configs.lsp.config.pyright"),
-			ruff = require("plugins.configs.lsp.config.ruff"),
-			pylsp = require("plugins.configs.lsp.config.pylsp"),
-		},
-		-- customize how language servers are attached
-		handlers = {
-			-- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
-			-- function(server, opts) require("lspconfig")[server].setup(opts) end
-			-- config Ty
+    servers = {},
+    -- customize language server configuration options passed to `lspconfig`
+    ---@diagnostic disable: missing-fields
+    config = {
+      -- clangd = require "plugins.configs.lsp.config.clangd",
+      basedpyright = require "plugins.configs.lsp.config.basedpyright",
+      jedi_language_server = require "plugins.configs.lsp.config.jedi_language",
+      pyright = require "plugins.configs.lsp.config.pyright",
+      ruff = require "plugins.configs.lsp.config.ruff",
+      pylsp = require "plugins.configs.lsp.config.pylsp",
+    },
+    -- customize how language servers are attached
+    handlers = {
+      -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
+      -- function(server, opts) require("lspconfig")[server].setup(opts) end
+      -- config Ty
 
-			-- the key is the server that is being setup with `lspconfig`
-			-- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
-			-- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
-		},
-		-- Configure buffer local auto commands to add when attaching a language server
-		autocmds = {
-			-- first key is the `augroup` to add the auto commands to (:h augroup)
-			lsp_document_highlight = {
-				-- Optional condition to create/delete auto command group
-				-- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
-				-- condition will be resolved for each client on each execution and if it ever fails for all clients,
-				-- the auto commands will be deleted for that buffer
-				cond = "textDocument/documentHighlight",
-				-- cond = function(client, bufnr) return client.name == "lua_ls" end,
-				-- list of auto commands to set
-				{
-					-- events to trigger
-					event = { "CursorHold", "CursorHoldI" },
-					-- the rest of the autocmd options (:h nvim_create_autocmd)
-					desc = "Document Highlighting",
-					callback = function()
-						vim.lsp.buf.document_highlight()
-					end,
-				},
-				{
-					event = { "CursorMoved", "CursorMovedI", "BufLeave" },
-					desc = "Document Highlighting Clear",
-					callback = function()
-						vim.lsp.buf.clear_references()
-					end,
-				},
-			},
-			-- disable inlay hints in insert mode
-			disable_inlay_hints_on_insert = {
-				-- only create for language servers that support inlay hints
-				-- (and only if vim.lsp.inlay_hint is available)
-				cond = vim.lsp.inlay_hint and "textDocument/inlayHint" or false,
-				{
-					-- when going into insert mode
-					event = "InsertEnter",
-					desc = "disable inlay hints on insert",
-					callback = function(args)
-						local filter = { bufnr = args.buf }
-						-- if the inlay hints are currently enabled
-						if vim.lsp.inlay_hint.is_enabled(filter) then
-							-- disable the inlay hints
-							vim.lsp.inlay_hint.enable(false, filter)
-							-- create a single use autocommand to turn the inlay hints back on
-							-- when leaving insert mode
-							vim.api.nvim_create_autocmd("InsertLeave", {
-								buffer = args.buf,
-								once = true,
-								callback = function()
-									vim.lsp.inlay_hint.enable(true, filter)
-								end,
-							})
-						end
-					end,
-				},
-			},
-		},
-		-- mappings to be set up on attaching of a language server
-		mappings = {
-			n = {
-			},
-		},
-		-- A custom `on_attach` function to be run after the default `on_attach` function
-		-- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
-		on_attach = function(client, bufnr)
-			-- this would disable semanticTokensProvider for all clients
-			-- client.server_capabilities.semanticTokensProvider = nil
-			-- Disable ruff_lsp hover in favor of pyright
-			if client.name == "ruff" then
-				client.server_capabilities.hoverProvider = false
-			end
+      -- the key is the server that is being setup with `lspconfig`
+      -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
+      -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
 
-			-- if client.name == "pyright" then
-			--   -- disable pyright analysis features
-			--   client.server_capabilities.documentFormattingProvider = false
-			--      client.server_capabilities.hoverProvider = false
+    },
+    -- Configure buffer local auto commands to add when attaching a language server
+    autocmds = {
+      -- first key is the `augroup` to add the auto commands to (:h augroup)
+      lsp_document_highlight = {
+        -- Optional condition to create/delete auto command group
+        -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
+        -- condition will be resolved for each client on each execution and if it ever fails for all clients,
+        -- the auto commands will be deleted for that buffer
+        cond = "textDocument/documentHighlight",
+        -- cond = function(client, bufnr) return client.name == "lua_ls" end,
+        -- list of auto commands to set
+        {
+          -- events to trigger
+          event = { "CursorHold", "CursorHoldI" },
+          -- the rest of the autocmd options (:h nvim_create_autocmd)
+          desc = "Document Highlighting",
+          callback = function() vim.lsp.buf.document_highlight() end,
+        },
+        {
+          event = { "CursorMoved", "CursorMovedI", "BufLeave" },
+          desc = "Document Highlighting Clear",
+          callback = function() vim.lsp.buf.clear_references() end,
+        },
+      },
+      -- disable inlay hints in insert mode
+      disable_inlay_hints_on_insert = {
+        -- only create for language servers that support inlay hints
+        -- (and only if vim.lsp.inlay_hint is available)
+        cond = vim.lsp.inlay_hint and "textDocument/inlayHint" or false,
+        {
+          -- when going into insert mode
+          event = "InsertEnter",
+          desc = "disable inlay hints on insert",
+          callback = function(args)
+            local filter = { bufnr = args.buf }
+            -- if the inlay hints are currently enabled
+            if vim.lsp.inlay_hint.is_enabled(filter) then
+              -- disable the inlay hints
+              vim.lsp.inlay_hint.enable(false, filter)
+              -- create a single use autocommand to turn the inlay hints back on
+              -- when leaving insert mode
+              vim.api.nvim_create_autocmd("InsertLeave", {
+                buffer = args.buf,
+                once = true,
+                callback = function() vim.lsp.inlay_hint.enable(true, filter) end,
+              })
+            end
+          end,
+        },
+      },
+    },
+    -- mappings to be set up on attaching of a language server
+    mappings = {
+      n = {},
+    },
+    -- A custom `on_attach` function to be run after the default `on_attach` function
+    -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
+    on_attach = function(client, bufnr)
+      -- this would disable semanticTokensProvider for all clients
+      -- client.server_capabilities.semanticTokensProvider = nil
+      -- Disable ruff_lsp hover in favor of pyright
+      if client.name == "ruff" then
+        client.server_capabilities.hoverProvider = false
+        client.server_capabilities.completionProvider = false
+      end
 
-			--    end
+      -- if client.name == "pyright" then
+      --   -- disable pyright analysis features
+      --   client.server_capabilities.documentFormattingProvider = false
+      --      client.server_capabilities.hoverProvider = false
 
-			-- Disable completion feature of pyright
-			if client.name == "ty" then
-				client.server_capabilities.completionProvider = false
-			end
+      --    end
 
-			if client.name == "basedpyright" then
-				client.server_capabilities.completionProvider = false
-				client.server_capabilities.codeLensProvider = false
-				client.server_capabilities.colorProvider = false
-				client.server_capabilities.callHierarchyProvider = false
-				client.server_capabilities.documentFormattingProvider = false
-				client.server_capabilities.documentRangeFormattingProvider = false
-				client.server_capabilities.declarationProvider = false
-				client.server_capabilities.documentLinkProvider = false
-				client.server_capabilities.definitionProvider = false
-				client.server_capabilities.documentOnTypeFormattingProvider = false
-				client.server_capabilities.documentSymbolProvider = false
-				client.server_capabilities.hoverProvider = false
-				client.server_capabilities.inlineCompletionProvider = false
-				client.server_capabilities.inlineValueProvider = false
-				client.server_capabilities.notebookDocumentSync = false
-				client.server_capabilities.signatureHelpProvider = false
-				client.server_capabilities.renameProvider = false
-				client.server_capabilities.typeDefinitionProvider = false
-				client.server_capabilities.workspaceSymbolProvider = false
-				client.server_capabilities.monikerProvider = false
-				client.server_capabilities.semanticTokensProvider = false
-				client.server_capabilities.referencesProvider = false
-				client.server_capabilities.implementationProvider = false
-				client.server_capabilities.foldingRangeProvider = false
-				client.server_capabilities.selectionRangeProvider = false
-				client.server_capabilities.linkedEditingRangeProvider = false
-				client.server_capabilities.executeCommandProvider = false
-				client.server_capabilities.workspace = {
-					workspaceFolders = { supported = false },
-					fileOperations = { supported = false }
-				}
-			end
-		end,
-	},
+      if client.name == "jedi_language_server" then client.server_capabilities.renameProvider = false end
+
+      if client.name == "basedpyright" then
+        -- client.server_capabilities.completionProvider = false
+        -- client.server_capabilities.hoverProvider = false
+        -- client.server_capabilities.renameProvider = false
+        -- client.server_capabilities.definitionProvider = false
+        client.server_capabilities.codeLensProvider = false
+        client.server_capabilities.colorProvider = false
+        client.server_capabilities.callHierarchyProvider = false
+        client.server_capabilities.documentFormattingProvider = false
+        client.server_capabilities.documentRangeFormattingProvider = false
+        client.server_capabilities.declarationProvider = false
+        client.server_capabilities.documentLinkProvider = false
+        client.server_capabilities.documentOnTypeFormattingProvider = false
+        client.server_capabilities.documentSymbolProvider = false
+        client.server_capabilities.inlineCompletionProvider = false
+        client.server_capabilities.inlineValueProvider = false
+        client.server_capabilities.notebookDocumentSync = false
+        client.server_capabilities.signatureHelpProvider = false
+        client.server_capabilities.typeDefinitionProvider = false
+        client.server_capabilities.workspaceSymbolProvider = false
+        client.server_capabilities.monikerProvider = false
+        client.server_capabilities.semanticTokensProvider = false
+        client.server_capabilities.referencesProvider = false
+        client.server_capabilities.implementationProvider = false
+        client.server_capabilities.foldingRangeProvider = false
+        client.server_capabilities.selectionRangeProvider = false
+        client.server_capabilities.linkedEditingRangeProvider = false
+        client.server_capabilities.executeCommandProvider = false
+        client.server_capabilities.workspace = {
+          workspaceFolders = { supported = false },
+          fileOperations = { supported = false },
+        }
+      end
+    end,
+  },
 }
diff --git a/lua/plugins/astroui.lua b/lua/plugins/astroui.lua
index 974b960..20569da 100644
--- a/lua/plugins/astroui.lua
+++ b/lua/plugins/astroui.lua
@@ -12,7 +12,6 @@ return {
     colorscheme = "bamboo-multiplex",
     -- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes
     highlights = require "plugins.configs.ui.highlights",
-
     -- Icons can be configured throughout the interface
     icons = require "plugins.configs.ui.icons",
     status = require "plugins.configs.ui.status",
diff --git a/lua/plugins/cmps.lua b/lua/plugins/cmps.lua
index b438721..5e696ad 100644
--- a/lua/plugins/cmps.lua
+++ b/lua/plugins/cmps.lua
@@ -7,48 +7,53 @@ return {
     end,
   },
   {
-  "Saghen/blink.cmp",
-  opts = {
-    keymap = {
+    "Saghen/blink.cmp",
+    opts = {
+      
+      keymap = {
         preset = "default",
         ["<C-f>"] = false,
+        ["<C-n>"] = false,
+        ["<C-p>"] = false,
       },
-    completion = {
-      list = { selection = { preselect = true, auto_insert = true } },
-      ghost_text = {
+      term = {
         enabled = false,
       },
-      menu = {
-        auto_show = function(ctx)
-          return ctx.mode ~= "cmdline"
-        end,
-        draw = {
-          columns = {
-            { "kind_icon", "label", gap = 1 },
-            { "kind" },
+      completion = {
+        list = {
+          selection = {
+            preselect = true,
+            -- auto_insert = true,
           },
-          components = {
-            kind = {
-              highlight = function(ctx)
-                local _, hl, _ = require("mini.icons").get("lsp", ctx.kind)
-                return hl
-              end,
+          inlay_hints = {
+            enabled = false,
+            in_insert = false,
+          }
+        },
+        ghost_text = {
+          enabled = false,
+        },
+        menu = {
+          auto_show = function(ctx) return ctx.mode ~= "cmdline" end,
+          draw = {
+            columns = {
+              { "kind_icon", "label", gap = 1 },
+              { "kind", gap = 1},
             },
           },
         },
-      },
-      accept = {
-        auto_brackets = { enabled = true },
-      },
-      documentation = {
-        auto_show = true,
-        auto_show_delay_ms = 0,
-        window = {
-          border = "rounded",
-          winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None",
+        accept = {
+          auto_brackets = { enabled = false },
+        },
+        documentation = {
+          auto_show = false,
+          auto_show_delay_ms = 0,
+          window = {
+            border = "rounded",
+            winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None",
+          },
         },
       },
     },
-  }
-}
+  },
 }
diff --git a/lua/plugins/configs/lsp/config/basedpyright.lua b/lua/plugins/configs/lsp/config/basedpyright.lua
index 837cd59..1cb98af 100644
--- a/lua/plugins/configs/lsp/config/basedpyright.lua
+++ b/lua/plugins/configs/lsp/config/basedpyright.lua
@@ -9,17 +9,17 @@ return {
       disableLanguageServices = false,
       disableOrganizeImports = true,
       disableTaggedHints = true,
-			useLibraryCodeForTypes = true,
       analysis = {
-        autoSearchPath = false,
+        autoSearchPath = true,
+			  useLibraryCodeForTypes = true,
         logLevel = "Trace",
         typeCheckingMode = "standard",
         deprecateTypingAliases = false,
         inlayHints = {
           variableTypes = true,
-          callArgumentNames = false,
-          functionReturnTypes = true,
+          -- functionReturnTypes = true,
           genericTypes = true,
+          callArgumentNames = true,
         },
         ignore = {
           "**/unsloth_compiled_cache/**",
diff --git a/lua/plugins/configs/lsp/config/jedi_language.lua b/lua/plugins/configs/lsp/config/jedi_language.lua
index aff58d5..8f7d266 100644
--- a/lua/plugins/configs/lsp/config/jedi_language.lua
+++ b/lua/plugins/configs/lsp/config/jedi_language.lua
@@ -10,11 +10,16 @@ return {
     hover = {
       enable = true,
     },
+    signatureHelp = {
+      enable = false,
+    },
     workspace = {
       -- environmentPath = "/home/duckq1u/miniconda3/envs/OCR3/bin/python",
       environmentPath = vim.fn.exepath "python",
       ignore = {
-        "/home/duckq1u/miniconda3/envs/OCR3/lib/python3.11/site-packages/transformers/mode ls/albert/configuration_albert.py",
+        -- "/home/duckq1u/miniconda3/envs/OCR3/lib/python3.11/site-packages/transformers/model/albert/configuration_albert.py",
+        -- "/home/duckq1u/miniconda3/envs/ocr2/lib/python3.12/site-packages/transformers/models/albert/configuration_albert.py",
+        "**configuration_albert.py",
         "**/unsloth_compiled_cache/**",
       },
     },
@@ -24,8 +29,9 @@ return {
         "numpy",
         "pandas",
         "torch",
+        "torchvision",
+        "pytorch_lightning"
         -- "torchmetrics",
-        -- "pytorch_lightning",
       },
     },
   },
diff --git a/lua/plugins/configs/ui/highlights.lua b/lua/plugins/configs/ui/highlights.lua
index 11e8e60..b6fa68c 100644
--- a/lua/plugins/configs/ui/highlights.lua
+++ b/lua/plugins/configs/ui/highlights.lua
@@ -12,7 +12,9 @@ return {
       DiagnosticVirtualTextWarn = { fg = get_hlgroup("DiagnosticWarn").fg, bg = "none" },
 
       CursorLineNr = { fg = "#FFD700", bg = "none", bold = true },
-      CursorLine = { fg = "none", bg = "#004C4C", bold = true },
+      CursorLine = { fg = "none", bg = "#005C4C", bold = true },
+      CursorColumn = { fg = "none", bg = "#005C4C", bold = true },
+
       Visual = { fg = "#000000", bg = "#FFFFFF", bold = true },
 
       -- remove background of inlay hints
diff --git a/lua/plugins/developments.lua b/lua/plugins/developments.lua
index 5e9780c..54508ac 100644
--- a/lua/plugins/developments.lua
+++ b/lua/plugins/developments.lua
@@ -8,8 +8,8 @@ return {
       icons = {
         type = "󰜁 ",
         parameter = "󰏪 ",
-        offspec = " ", -- hint kind not defined in official LSP spec
-        unknown = " ", -- hint kind is nil
+        offspec = "󰀒 ", -- hint kind not defined in official LSP spec
+        unknown = " ", -- hint kind is nil
       },
       label = {
         truncateAtChars = 100,
diff --git a/lua/plugins/disabled.lua b/lua/plugins/disabled.lua
index 9bb7070..791e9d9 100644
--- a/lua/plugins/disabled.lua
+++ b/lua/plugins/disabled.lua
@@ -14,5 +14,4 @@ return {
   -- Disabled development plugins
   { "mfussenegger/nvim-dap", enabled = false },
   { "jay-babu/mason-nvim-dap.nvim", enabled = false },
-  { "brenton-leighton/multiple-cursors.nvim", enabled = false },
 }
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
deleted file mode 100644
index 920b3e6..0000000
--- a/lua/plugins/mason.lua
+++ /dev/null
@@ -1,35 +0,0 @@
-if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
-
--- Customize Mason
-
----@type LazySpec
-return {
-  -- use mason-tool-installer for automatically installing Mason packages
-  {
-    "WhoIsSethDaniel/mason-tool-installer.nvim",
-    -- overrides `require("mason-tool-installer").setup(...)`
-    opts = {
-      -- Make sure to use the names found in `:Mason`
-      ensure_installed = {
-        -- install language servers
-        "lua-language-server",
-        -- install debuggers
-        "jedi_language_server",
-        "ruff",
-        "basedpyright",
-        -- install any other package
-        "tree-sitter-cli",
-      },
-      ui = {
-        border = "single",
-        width = 0.8,
-        height = 0.9,
-        icons = {
-          package_installed = "  ",
-          package_pending = "  ",
-          package_uninstalled = "  ",
-        },
-      },
-    },
-  },
-}
diff --git a/lua/plugins/motions.lua b/lua/plugins/motions.lua
index ad00f9e..a17e2c5 100644
--- a/lua/plugins/motions.lua
+++ b/lua/plugins/motions.lua
@@ -1,22 +1,38 @@
 -- Motion, Navigation and Multiple Cursors
 return {
   -- Multi-cursors support
-  {
-    "brenton-leighton/multiple-cursors.nvim",
-    version = "*",
-    opts = {},
-    keys = {
-      { "<C-Down>", "<Cmd>MultipleCursorsAddDown<CR>", mode = { "n", "i", "x" } },
-      { "<C-Up>", "<Cmd>MultipleCursorsAddUp<CR>", mode = { "n", "i", "x" } },
-      { "<A-LeftMouse>", "<Cmd>MultipleCursorsMouseAddDelete<CR>", mode = { "n", "i" } },
-      { "<Leader>a", "<Cmd>MultipleCursorsAddMatches<CR>", mode = { "n", "x" } },
-      { "<C-D>", "<Cmd>MultipleCursorsAddJumpNextMatch<CR>", mode = { "n", "x" } },
-    },
-  },
   -- Alternative multi-cursor plugin
   {
     "mg979/vim-visual-multi",
-    event = "BufRead",
+    event = { "User AstroFile", "InsertEnter" },
+    dependencies = {
+      "AstroNvim/astrocore",
+      ---@param opts astrocoreopts
+      opts = function(_, opts)
+        if not opts.options then opts.options = {} end
+        if not opts.options.g then opts.options.g = {} end
+        opts.options.g.VM_silent_exit = 1
+        opts.options.g.VM_show_warnings = 0
+
+        if not opts.autocmds then opts.autocmds = {} end
+        opts.autocmds.visual_multi_exit = {
+          {
+            event = "User",
+            pattern = "visual_multi_exit",
+            desc = "Avoid spurious 'hit-enter-prompt' when exiting vim-visual-multi",
+            callback = function()
+              vim.o.cmdheight = 1
+              vim.schedule(function() vim.o.cmdheight = opts.options.opt.cmdheight end)
+            end,
+          },
+        }
+
+        if not opts.mappings then opts.mappings = require("astrocore").empty_map_table() end
+        local maps = assert(opts.mappings)
+        maps.n["<C-up>"] = { "<C-u>call vm#commands#add_cursor_up(0, v:count1)<cr>", desc = "Add cursor above" }
+        maps.n["<C-down>"] = { "<C-u>call vm#commands#add_cursor_down(0, v:count1)<cr>", desc = "Add cursor below" }
+      end,
+    },
   },
   -- Better move by word
   {
@@ -29,7 +45,7 @@ return {
       { "ge", "<Cmd>lua require('spider').motion('ge')<CR>", mode = { "n", "o", "x" }, desc = "Spider-ge" },
     },
   },
-  
+
   -- Better character motion
   {
     "folke/flash.nvim",
@@ -52,7 +68,7 @@ return {
       },
     },
   },
-  
+
   -- Move code block
   {
     "echasnovski/mini.move",
diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua
index 35f411e..1ea3082 100644
--- a/lua/plugins/neo-tree.lua
+++ b/lua/plugins/neo-tree.lua
@@ -29,7 +29,7 @@ return {
         width = 50
       },
       enable_git_status = false,
-      enable_diagnostics = false,
+      enable_diagnostics = true,
       git_status_async = false,
     },
   },
diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
index d8d9adf..f8fd213 100644
--- a/lua/plugins/ui.lua
+++ b/lua/plugins/ui.lua
@@ -38,4 +38,27 @@ return {
       },
     },
   },
+  {
+    "OXY2DEV/markview.nvim",
+    ft = function()
+      local plugin = require("lazy.core.config").spec.plugins["markview.nvim"]
+      local opts = require("lazy.core.plugin").values(plugin, "opts", false)
+      return opts.filetypes or { "markdown", "quarto", "rmd" }
+    end,
+    dependencies = {
+      "nvim-treesitter/nvim-treesitter",
+      opts = function(_, opts)
+        if opts.ensure_installed ~= "all" then
+          opts.ensure_installed =
+            require("astrocore").list_insert_unique(opts.ensure_installed, { "html", "markdown", "markdown_inline" })
+        end
+      end,
+    },
+    opts = {
+      preview = {
+        hybrid_modes = { "n" },
+        headings = { shift_width = 0 },
+      },
+    },
+  },
 }
diff --git a/lua/plugins/user.lua b/lua/plugins/user.lua
index d1e288a..0b3c316 100644
--- a/lua/plugins/user.lua
+++ b/lua/plugins/user.lua
@@ -53,7 +53,7 @@ return {
   {
     "altermo/ultimate-autopair.nvim",
     event = "InsertEnter",
-    -- branch = "v0.6",
+    branch = "v0.6",
     opts = {
       cmap = false,
       extensions = {