diff --git a/init.lua b/init.lua
index 425b155..7570d62 100644
--- a/init.lua
+++ b/init.lua
@@ -15,5 +15,7 @@ if not pcall(require, "lazy") then
   vim.cmd.quit()
 end
 
+
 require "lazy_setup"
 require "polish"
+
diff --git a/lazy-lock.json b/lazy-lock.json
index f032d82..d337b4a 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,87 +1,86 @@
 {
-  "AstroNvim": { "branch": "main", "commit": "932e6aa373280bf179fc3cef11c4fbd00faff9ec" },
+  "AstroNvim": { "branch": "main", "commit": "4697961743f500bfa2a8ccd9aef5863219a8bb8d" },
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "aerial.nvim": { "branch": "master", "commit": "9c29a1a66eb31384888e413e510ba72496e06770" },
-  "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" },
-  "astrocommunity": { "branch": "main", "commit": "97ef9556767611f398d636d0dd59714a7538f69b" },
+  "aerial.nvim": { "branch": "master", "commit": "1160fb7a15a34b03b7381d95d45560712b5f19d0" },
+  "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
+  "astrocommunity": { "branch": "main", "commit": "31e12fdbcba1ae7094d8b027c6e65d01e6f133e9" },
   "astrocore": { "branch": "main", "commit": "0fcaac66d115948605c14eaf45a41d3923eaafeb" },
   "astrolsp": { "branch": "main", "commit": "2f6b0a4059775a1dac011d2944dd41fd4a8fe7a8" },
   "astrotheme": { "branch": "main", "commit": "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5" },
-  "astroui": { "branch": "main", "commit": "7adeb60d76939d3cd66c9852e0e8621bd42014dd" },
-  "auto-save.nvim": { "branch": "main", "commit": "5fbcaac0a2698c87a9a1bd2083cb6949505cca12" },
-  "bamboo.nvim": { "branch": "master", "commit": "57e1bff1c0df29d7ec0071baf49210c48fc4a98b" },
+  "astroui": { "branch": "main", "commit": "076766c1d422db486378354729f8fa7c1a68b745" },
+  "auto-save.nvim": { "branch": "main", "commit": "b58948445c43e6903987a9bb97c82e66fdcc0786" },
+  "bamboo.nvim": { "branch": "master", "commit": "0a94f81705733951be286493b8d1876d0e3d990f" },
   "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
   "catppuccin": { "branch": "main", "commit": "0b5df9c9e641b1212b21a0762ccad4434fd41322" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "8f7b72100883e0e34400d9518d40a03f21e4d0a6" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "code_runner.nvim": { "branch": "main", "commit": "dcedccbf969a0f3bc00db446172b4966e83101dd" },
+  "code_runner.nvim": { "branch": "main", "commit": "65218f8f646fe61e506090522df357539642ae83" },
   "cyberdream.nvim": { "branch": "main", "commit": "cd3c2e7955034a5bec0e1beb9d7cb80c639ef5d5" },
-  "dressing.nvim": { "branch": "master", "commit": "43b8f74e0b1e3f41e51f640f8efa3bcd401cea0d" },
+  "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
   "duplicate.nvim": { "branch": "main", "commit": "ab057af7872c44e6fbd48df9b03983c8e67c50a7" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
-  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
+  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
   "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" },
   "grug-far.nvim": { "branch": "main", "commit": "190c03d54e8976491e6e49acb97087bf4182b079" },
   "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" },
-  "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
+  "heirline.nvim": { "branch": "master", "commit": "cc359b628266cb9a84b2d71c883f2b99e16473a0" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" },
   "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" },
-  "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
-  "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
+  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
+  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
   "lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" },
-  "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },
-  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
+  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "luvit-meta": { "branch": "main", "commit": "55709f183b0742a7e4f47688c284f81148ad4dc0" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "markview.nvim": { "branch": "main", "commit": "67b69cdaf9055bebac3682a070d7e5c8eecba29c" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
+  "markview.nvim": { "branch": "main", "commit": "72cd34279e94ee96ee33bdf30a87b00e6d45319d" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
   "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
   "mini.bufremove": { "branch": "main", "commit": "1ee294a97e091d3cf967974df622c0d887890dc2" },
-  "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
+  "mini.icons": { "branch": "main", "commit": "6787321f70d674a481776b7cc2c781fb7002c644" },
   "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
   "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" },
-  "mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" },
+  "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
   "monokai-pro.nvim": { "branch": "master", "commit": "4f4133601296881bb2197800bd68d2bba9eaadb9" },
   "multiple-cursors.nvim": { "branch": "main", "commit": "2f5e786c43aa9c0fc34b295cfcc9bfbacef8e926" },
   "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
-  "neoconf.nvim": { "branch": "main", "commit": "fb03e7ab64f17464e58a3bd7b98a515e4859204c" },
-  "noice.nvim": { "branch": "main", "commit": "2087bbf8cd64482b47fb5f33b5e0eabf329ab14b" },
-  "none-ls.nvim": { "branch": "main", "commit": "dcc8cd4efdcb29275681a3c95786a816330dbca6" },
+  "neoconf.nvim": { "branch": "main", "commit": "05d25c121e07c464d6b4203204aa113453eca152" },
+  "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
+  "none-ls.nvim": { "branch": "main", "commit": "c279e541f73a2deea9deb5231b9c037678dd6353" },
   "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
   "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" },
-  "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
-  "nvim-dap": { "branch": "master", "commit": "8517126e9323e346f6a99b3b594c5a940b914dcd" },
+  "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" },
+  "nvim-dap": { "branch": "master", "commit": "b08e05d7cff6024a9c29b64287d295db7c191450" },
   "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "e967e2ba13fd4ca731b41d0e5cc1ac2edcd6e25e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d01864641c6e43c681c3e9f6cf4745c75fdd9dcc" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "68a4df620cf58e2c7336e53738e8cf3a522ad694" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5a812abc65d529ea7673059a348814c21d7f87ff" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-spider": { "branch": "main", "commit": "b1c542a78522d59432a827f6ec2b28f9422c7e7f" },
-  "nvim-treesitter": { "branch": "master", "commit": "c91122d2012682301df68307cfc049a57c3fd286" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
+  "nvim-notify": { "branch": "master", "commit": "29b33efc802a304b1cf13ab200915d4e9e67373d" },
+  "nvim-spider": { "branch": "main", "commit": "2b38e3e95e143313d78ca098eeecda7aebfce925" },
+  "nvim-treesitter": { "branch": "master", "commit": "337b503688eccb3046547661e4c738e674548fcf" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
   "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "f22496dfdd46da4d571f5254c72eff65ff5a1c27" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "77e5bad54227dcfe3878ffbda88ab1efdaacb475" },
   "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
-  "smart-splits.nvim": { "branch": "master", "commit": "1a2b268a7ec7aeef879cdd15973339010ec134f7" },
+  "smart-splits.nvim": { "branch": "master", "commit": "00fba7a0e912a8d82da91a3b6b11d641fa500bd8" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
+  "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "transparent.nvim": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" },
-  "treesj": { "branch": "main", "commit": "0d81326b5afd36babe7dd480aabbb0b05f33e688" },
-  "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
+  "treesj": { "branch": "main", "commit": "94f6df623f2d15630b1b617abff39962024cb501" },
+  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
   "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "9e3209190c22953566ae4e6436ad2b4ff4dabb95" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
   "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
-  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }
+  "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }
 }
diff --git a/lua/core/autocmds.lua b/lua/core/autocmds.lua
index e54106c..34315d2 100644
--- a/lua/core/autocmds.lua
+++ b/lua/core/autocmds.lua
@@ -4,11 +4,6 @@ vim.api.nvim_create_augroup("auto_wrap", { clear = true })
 vim.api.nvim_create_augroup("disable_suspend_with_c_z", { clear = true })
 vim.api.nvim_create_augroup("clear_last_search", { clear = true })
 
--- NOTE: CursorLineNr setting
-vim.api.nvim_set_hl(0, "CursorLineNr", { fg = "#FFD700", bg = "none", bold = true })
--- NOTE: visual line colors
-vim.api.nvim_set_hl(0, "Visual", { fg = "#000000", bg = "#FFFFFF", bold = true })
-
 -- NOTE: Set colors for hightlights for similar words 
 -- vim.api.nvim_set_hl(0, "LspReferenceRead", { fg = "#FF0000" })
 -- vim.api.nvim_set_hl(0, "LspReferenceWrite", { fg = "#FF0000" })
diff --git a/lua/plugins/astrolsp.lua b/lua/plugins/astrolsp.lua
index 131251c..37150e8 100644
--- a/lua/plugins/astrolsp.lua
+++ b/lua/plugins/astrolsp.lua
@@ -10,7 +10,7 @@ return {
     -- 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
+      codelens = false, -- enable/disable codelens refresh on start
       inlay_hints = true, -- enable/disable inlay hints on start
       semantic_tokens = true, -- enable/disable semantic token highlighting
     },
@@ -21,8 +21,25 @@ return {
     -- 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",
+      -- clangd = require "plugins.configs.lsp.config.clangd",
+      -- basedpyright = require "plugins.configs.lsp.config.basedpyright",
+      jedi_language_server = {
+        init_options = {
+          completion = {
+            disableSnippets = true,
+          },
+        },
+      },
+      ruff_lsp = {
+        init_options = {
+          settings = {
+            args = {
+              "--extend-select=W,COM,ICN",
+              "--ignore=E501,E722,COM812",
+            },
+          },
+        },
+      },
     },
     -- customize how language servers are attached
     handlers = {
diff --git a/lua/plugins/colorschemes.lua b/lua/plugins/colorschemes.lua
index 114c69c..bffcc5f 100644
--- a/lua/plugins/colorschemes.lua
+++ b/lua/plugins/colorschemes.lua
@@ -89,5 +89,18 @@ return {
     },
   },
 
-  { "ribru17/bamboo.nvim", lazy = true, opts = { integrations = { mini = true } } },
+  -- Using lazy.nvim
+  {
+    "ribru17/bamboo.nvim",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      require("bamboo").setup {
+        -- optional configuration here
+        integrations = { mini = true },
+        terminal_colors = false
+      }
+      require("bamboo").load()
+    end,
+  },
 }
diff --git a/lua/plugins/configs/lsp/config/basedpyright.lua b/lua/plugins/configs/lsp/config/basedpyright.lua
index 38c8b92..dbbcab8 100644
--- a/lua/plugins/configs/lsp/config/basedpyright.lua
+++ b/lua/plugins/configs/lsp/config/basedpyright.lua
@@ -1,34 +1,34 @@
-return {
-  before_init = function(_, c)
-    if not c.settings then c.settings = {} end
-    if not c.settings.python then c.settings.python = {} end
-    c.settings.python.pythonPath = vim.fn.exepath "python"
-  end,
-  settings = {
-    basedpyright = {
-      analysis = {
-        -- diagnosticMode = "workspace",
-        diagnosticMode = "openFilesOnly",
-        typeCheckingMode = "basic",
-        autoImportCompletions = true,
-        autoSearchPath = true,
-        inlayHints = {
-          variableTypes = true,
-          functionReturnTypes = true,
-          callArgumentNames = true,
-          pytestParameters = true,
-        },
-        useLibraryCodeForTypes = true,
-        diagnosticSeverityOverrides = {
-          reportUnusedImport = "information",
-          reportUnusedFunction = "information",
-          reportUnusedVariable = "information",
-          -- reportGeneralTypeIssues = "none",
-          -- reportOptionalMemberAccess = "none",
-          -- reportOptionalSubscript = "none",
-          -- reportPrivateImportUsage = "none",
-        },
-      },
-    },
-  },
-}
+-- return {
+--   before_init = function(_, c)
+--     if not c.settings then c.settings = {} end
+--     if not c.settings.python then c.settings.python = {} end
+--     c.settings.python.pythonPath = vim.fn.exepath "python"
+--   end,
+--   settings = {
+--     basedpyright = {
+--       analysis = {
+--         -- diagnosticMode = "workspace",
+--         diagnosticMode = "off",
+--         typeCheckingMode = "basic",
+--         autoImportCompletions = true,
+--         autoSearchPath = true,
+--         inlayHints = {
+--           variableTypes = true,
+--           functionReturnTypes = true,
+--           callArgumentNames = true,
+--           pytestParameters = true,
+--         },
+--         useLibraryCodeForTypes = true,
+--         diagnosticSeverityOverrides = {
+--           reportUnusedImport = "information",
+--           reportUnusedFunction = "information",
+--           reportUnusedVariable = "information",
+--           reportGeneralTypeIssues = "none",
+--           reportOptionalMemberAccess = "none",
+--           reportOptionalSubscript = "none",
+--           reportPrivateImportUsage = "none",
+--         },
+--       },
+--     },
+--   },
+-- }
diff --git a/lua/plugins/configs/lsp/config/clangd.lua b/lua/plugins/configs/lsp/config/clangd.lua
index 93ba604..b3bf5ce 100644
--- a/lua/plugins/configs/lsp/config/clangd.lua
+++ b/lua/plugins/configs/lsp/config/clangd.lua
@@ -1,19 +1,19 @@
-return {
-  capabilities = {
-    offsetEncoding = "utf-8",
-  },
-  cmd = {
-    "clangd",
-    "--background-index",
-    "--clang-tidy",
-    "--all-scopes-completion",
-    "--header-insertion=iwyu",
-    "--completion-style=detailed",
-    "--fallback-style=Microsoft",
-  },
-  init_options = {
-    clangdFileStatus = true,
-    usePlaceholders = false,
-    completeUnimported = true,
-  },
-}
+-- return {
+--   capabilities = {
+--     offsetEncoding = "utf-8",
+--   },
+--   cmd = {
+--     "clangd",
+--     "--background-index",
+--     "--clang-tidy",
+--     "--all-scopes-completion",
+--     "--header-insertion=iwyu",
+--     "--completion-style=detailed",
+--     "--fallback-style=Microsoft",
+--   },
+--   init_options = {
+--     clangdFileStatus = true,
+--     usePlaceholders = false,
+--     completeUnimported = true,
+--   },
+-- }
diff --git a/lua/plugins/configs/ui/highlights.lua b/lua/plugins/configs/ui/highlights.lua
index 3609ec2..7683701 100644
--- a/lua/plugins/configs/ui/highlights.lua
+++ b/lua/plugins/configs/ui/highlights.lua
@@ -10,28 +10,13 @@ return {
       DiagnosticVirtualTextHint = { fg = get_hlgroup("DiagnosticHint").fg, bg = "none" },
       DiagnosticVirtualTextInfo = { fg = get_hlgroup("DiagnosticInfo").fg, bg = "none" },
       DiagnosticVirtualTextWarn = { fg = get_hlgroup("DiagnosticWarn").fg, bg = "none" },
+      CursorLineNr = { fg = "#FFD700", bg = "none", bold = true },
+      Visual = { fg = "#000000", bg = "#FFFFFF", bold = true },
 
       -- remove background of inlay hints
       LspInlayHint = { fg = get_hlgroup("LspInlayHint").fg, bg = "none" },
-    }
 
-    if utils.is_available "kanagawa.nvim" and ui.config.colorscheme == "kanagawa" then
-      local colors = require("kanagawa.colors").setup()
-      local theme = colors.theme
-      hl = utils.extend_tbl(hl, {
-        Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1 }, -- add `blend = vim.o.pumblend` to enable transparency
-        PmenuSel = { fg = "NONE", bg = theme.ui.bg_p2 },
-        PmenuSbar = { bg = theme.ui.bg_m1 },
-        PmenuThumb = { bg = theme.ui.bg_p2 },
-        TelescopeTitle = { fg = theme.ui.special, bold = true },
-        TelescopePromptNormal = { bg = theme.ui.bg_p1 },
-        TelescopePromptBorder = { fg = theme.ui.bg_p1, bg = theme.ui.bg_p1 },
-        TelescopeResultsNormal = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m1 },
-        TelescopeResultsBorder = { fg = theme.ui.bg_m1, bg = theme.ui.bg_m1 },
-        TelescopePreviewNormal = { bg = theme.ui.bg_dim },
-        TelescopePromptNormalopePreviewBorder = { bg = theme.ui.bg_dim, fg = theme.ui.bg_dim },
-      })
-    end
+    }
 
     return hl
   end,
@@ -39,3 +24,4 @@ return {
     -- Normal = { bg = "#000000" },
   },
 }
+
diff --git a/lua/plugins/disabled.lua b/lua/plugins/disabled.lua
index d4d8f32..ff74652 100644
--- a/lua/plugins/disabled.lua
+++ b/lua/plugins/disabled.lua
@@ -4,7 +4,7 @@ return {
   { "s1n7ax/nvim-window-picker", enabled = false },
   { "akinsho/toggleterm.nvim", enabled = false },
   { "NvChad/nvim-colorizer.lua", enabled = false },
-  { "catppuccin/nvim", name = "catppuccin", enabled = false },
+  { "catppuccin/nvim", name = "catppuccin", enabled = false},
   { "rebelot/kanagawa.nvim", enabled = false },
   { "folke/tokyonight.nvim", enabled = false },
   { "f4z3r/gruvbox-material.nvim", name = "gruvbox-material", enabled = false },
@@ -27,6 +27,7 @@ return {
   { "xiyaowong/transparent.nvim", enabled = false },
   { "iamcco/markdown-preview.nvim", enabled = false },
   { "max397574/better-escape.nvim", enabled = false },
+  { "ribru17/bamboo.nvim", enabled = true },
 
   -- { "hrsh7th/nvim-cmp", enabled = false },
 }
diff --git a/lua/plugins/lsp-features.lua b/lua/plugins/lsp-features.lua
index 43ec8e9..99bd078 100644
--- a/lua/plugins/lsp-features.lua
+++ b/lua/plugins/lsp-features.lua
@@ -17,28 +17,28 @@ return {
     end,
   },
   -- Additional features for Clangd
-  {
-    "p00f/clangd_extensions.nvim",
-    lazy = true,
-    ft = { "c", "cpp" },
-    dependencies = {
-      "AstroNvim/astrocore",
-      opts = {
-        autocmds = {
-          clangd_extensions = {
-            {
-              event = "LspAttach",
-              desc = "Load clangd_extensions with clangd",
-              callback = function(args)
-                if assert(vim.lsp.get_client_by_id(args.data.client_id)).name == "clangd" then
-                  require "clangd_extensions"
-                  vim.api.nvim_del_augroup_by_name "clangd_extensions"
-                end
-              end,
-            },
-          },
-        },
-      },
-    },
-  },
+  -- {
+  --   "p00f/clangd_extensions.nvim",
+  --   lazy = true,
+  --   ft = { "c", "cpp" },
+  --   dependencies = {
+  --     "AstroNvim/astrocore",
+  --     opts = {
+  --       autocmds = {
+  --         clangd_extensions = {
+  --           {
+  --             event = "LspAttach",
+  --             desc = "Load clangd_extensions with clangd",
+  --             callback = function(args)
+  --               if assert(vim.lsp.get_client_by_id(args.data.client_id)).name == "clangd" then
+  --                 require "clangd_extensions"
+  --                 vim.api.nvim_del_augroup_by_name "clangd_extensions"
+  --               end
+  --             end,
+  --           },
+  --         },
+  --       },
+  --     },
+  --   },
+  -- },
 }
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
index 9e9e93f..92ce191 100644
--- a/lua/plugins/mason.lua
+++ b/lua/plugins/mason.lua
@@ -10,9 +10,11 @@ return {
       -- add more things to the ensure_installed table protecting against community packs modifying it
       opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
         "lua_ls",
-        "clangd",
-        "basedpyright",
+        "jedi_language_server",
         "ruff",
+        -- "clangd",
+        -- "basedpyright",
+        -- "ruff",
       })
     end,
   },
@@ -24,9 +26,9 @@ return {
       -- add more things to the ensure_installed table protecting against community packs modifying it
       opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
         "stylua",
-        "clang-format",
+        -- "clang-format",
         -- "black",
-        "prettier",
+        -- "prettier",
       })
     end,
   },
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 55af936..9891436 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -14,7 +14,7 @@ return {
     })
     opts.highlight = {
       enable = true,
-      disable = { "c", "rust", "tsx", "javascript", "python"},
+      disable = { "c", "rust", "tsx", "javascript"},
       additional_vim_regex_highlighting = false,
       custom_captures = {
         -- Highlight local variables