diff --git a/init.lua b/init.lua
index bd22929..7a4e0e4 100644
--- a/init.lua
+++ b/init.lua
@@ -1,4 +1,3 @@
-vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46/"
 vim.g.mapleader = " "
 
 -- bootstrap lazy and all plugins
@@ -18,10 +17,6 @@ require("lazy").setup({
     { import = "plugins" },
 }, lazy_config)
 
--- load theme
-dofile(vim.g.base46_cache .. "defaults")
-dofile(vim.g.base46_cache .. "statusline")
-
 require "options"
 require "autocmds"
 
@@ -36,7 +31,7 @@ vim.opt.shiftwidth = 4
 -- vim.opt.expandtab = true
 
 -- code folding: zR (open all), zM (close all), za (toggle under cursor), zk & zj (nav between folds)
-vim.opt.foldmethod = "expr"
+vim.opt.foldmethod = "indent"
 vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
 vim.opt.foldlevel = 99
 vim.opt.foldlevelstart = 10
diff --git a/lazy-lock.json b/lazy-lock.json
index 88fba70..fff6577 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,43 +1,43 @@
 {
   "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" },
-  "base46": { "branch": "v2.5", "commit": "fde7a2cd54599e148d376f82980407c2d24b0fa2" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "conform.nvim": { "branch": "master", "commit": "374aaf384e2e841607b8e2fe63fa3ad01d111c91" },
+  "conform.nvim": { "branch": "master", "commit": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25" },
   "coq.artifacts": { "branch": "artifacts", "commit": "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b" },
-  "coq.thirdparty": { "branch": "3p", "commit": "6ee3c221c308dca7071387267ac76c9272b184a9" },
-  "coq_nvim": { "branch": "coq", "commit": "07dfa511508c53a512d269135cb75c177894a910" },
+  "coq.thirdparty": { "branch": "3p", "commit": "2bd969a2bcd2624f9c260b1000957c7e665e308e" },
+  "coq_nvim": { "branch": "coq", "commit": "d8b71757358038fa151fb45c493c3a1e8c3629a3" },
   "dir-telescope.nvim": { "branch": "main", "commit": "805405b9f98dc3470f8676773dc0e6151a9158ed" },
-  "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" },
-  "go.nvim": { "branch": "master", "commit": "37ec4d9be3edef64b725bfe29684e1fe019873bc" },
-  "guihua.lua": { "branch": "master", "commit": "0cc9631914ffcbe3e474e809c610d12a75b660cf" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
+  "go.nvim": { "branch": "master", "commit": "41a18f0c05534c375bafec7ed05cdb409c4abcc6" },
+  "guihua.lua": { "branch": "master", "commit": "ef44ba40f12e56c1c9fa45967f2b4d142e4b97a0" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
-  "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
   "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" },
-  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
-  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
-  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
-  "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
-  "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
-  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
+  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
+  "nvim-dap": { "branch": "master", "commit": "818cd8787a77a97703eb1d9090543a374f79a9ac" },
+  "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-lint": { "branch": "master", "commit": "c4043f48eb7e16bcfe96de1d9b718b695ff95ed6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "61e5109c8cf24807e4ae29813a3a82b31821dd45" },
+  "nvim-lint": { "branch": "master", "commit": "1f19dacd945a7b1a57f29f32b2d7168384df3d36" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5eeb45c8c469b84777a5bd8796b698c8a1c780a7" },
   "nvim-navbuddy": { "branch": "master", "commit": "a34786c77a528519f6b8a142db7609f6e387842d" },
-  "nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" },
+  "nvim-navic": { "branch": "master", "commit": "7d914a39a1ef8f4e22c2c4381abeef7c556f5a13" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-tree.lua": { "branch": "master", "commit": "e7d1b7dadc62fe2eccc17d814354b0a5688621ce" },
-  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "5c48b8ba1b0b7b25feb6e34e7eb293ea893aedc4" },
-  "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "precognition.nvim": { "branch": "main", "commit": "a0ed9c97b24002394201c39755e10495d47b2d3f" },
-  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
+  "nvim-tree.lua": { "branch": "master", "commit": "b8b44b6a2494d086a9177251a119f9daec6cace8" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "precognition.nvim": { "branch": "main", "commit": "2aae2687207029b3611a0e19a289f9e1c7efbe16" },
+  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
   "solarized-osaka.nvim": { "branch": "main", "commit": "f796014c14b1910e08d42cc2077fef34f08e0295" },
-  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "telescope.nvim": { "branch": "master", "commit": "e709d31454ee6e6157f0537f861f797bd44c0bad" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "vim-illuminate": { "branch": "master", "commit": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }
diff --git a/lua/plugins/filemanagement/nvim-tree.lua b/lua/plugins/filemanagement/nvim-tree.lua
index e47d99d..4e68d9f 100644
--- a/lua/plugins/filemanagement/nvim-tree.lua
+++ b/lua/plugins/filemanagement/nvim-tree.lua
@@ -1,4 +1,4 @@
-dofile(vim.g.base46_cache .. "nvimtree")
+
 
 local config = {
     filters = {
diff --git a/lua/plugins/filemanagement/telescope.lua b/lua/plugins/filemanagement/telescope.lua
index f5c2d68..e4a4d4e 100644
--- a/lua/plugins/filemanagement/telescope.lua
+++ b/lua/plugins/filemanagement/telescope.lua
@@ -1,7 +1,7 @@
-dofile(vim.g.base46_cache .. "telescope")
+
 pcall(function()
-    dofile(vim.g.base46_cache .. "syntax")
-    dofile(vim.g.base46_cache .. "treesitter")
+    
+    
 end)
 
 -- Clone the default Telescope configuration
diff --git a/lua/plugins/filemanagement/which-key.lua b/lua/plugins/filemanagement/which-key.lua
index 8ea329f..b44071f 100644
--- a/lua/plugins/filemanagement/which-key.lua
+++ b/lua/plugins/filemanagement/which-key.lua
@@ -3,7 +3,7 @@ return {
     keys = { "<leader>", "<c-w>", '"', "'", "`", "c", "v", "g" },
     cmd = "WhichKey",
     opts = function()
-        dofile(vim.g.base46_cache .. "whichkey")
+        
         return {}
     end,
 }
diff --git a/lua/plugins/formatting/conform.lua b/lua/plugins/formatting/conform.lua
index 0df1ba5..fc6499b 100644
--- a/lua/plugins/formatting/conform.lua
+++ b/lua/plugins/formatting/conform.lua
@@ -8,12 +8,19 @@ local options = {
         go = { "goimports-reviser", "gofumpt" },
         sql = { "sqlfmt" },
         cpp = { "clang-format" },
+        python = { "black" },
     },
 
     format_on_save = {
-        timeout_ms = 1000,
+        timeout_ms = 5000,
         lsp_fallback = true,
     },
+
+    formatters = {
+        black = {
+            prepend_args = { "--fast" },
+        },
+    },
 }
 
 return {
diff --git a/lua/plugins/gittools/gitsigns.lua b/lua/plugins/gittools/gitsigns.lua
index 5af1d42..f2d568a 100644
--- a/lua/plugins/gittools/gitsigns.lua
+++ b/lua/plugins/gittools/gitsigns.lua
@@ -1,4 +1,4 @@
-dofile(vim.g.base46_cache .. "git")
+
 
 local config = {
     signs = {
diff --git a/lua/plugins/lsp/configs/lspconfig.lua b/lua/plugins/lsp/configs/lspconfig.lua
index f0fe789..9ae5cbc 100644
--- a/lua/plugins/lsp/configs/lspconfig.lua
+++ b/lua/plugins/lsp/configs/lspconfig.lua
@@ -75,7 +75,7 @@ capabilities.textDocument.completion.completionItem = {
 }
 
 local defaults = function()
-    dofile(vim.g.base46_cache .. "lsp")
+    
     -- require("nvchad.lsp").diagnostic_config()
 
     require("lspconfig").lua_ls.setup {
diff --git a/lua/plugins/lsp/lspconfig.lua b/lua/plugins/lsp/lspconfig.lua
index f94154d..abda340 100644
--- a/lua/plugins/lsp/lspconfig.lua
+++ b/lua/plugins/lsp/lspconfig.lua
@@ -1,5 +1,6 @@
 return {
     "neovim/nvim-lspconfig",
+    event = "VeryLazy",
     dependencies = {
         -- coq for autocompletion
         { "ms-jpq/coq_nvim", branch = "coq" }, -- main one
diff --git a/lua/plugins/lsp/mason.lua b/lua/plugins/lsp/mason.lua
index c9a5df2..256ec3a 100644
--- a/lua/plugins/lsp/mason.lua
+++ b/lua/plugins/lsp/mason.lua
@@ -1,4 +1,4 @@
-dofile(vim.g.base46_cache .. "mason")
+
 
 local config = {
     PATH = "skip",
diff --git a/lua/plugins/ui/base46.lua b/lua/plugins/ui/base46.lua
index 2cc3d42..a16b8e6 100644
--- a/lua/plugins/ui/base46.lua
+++ b/lua/plugins/ui/base46.lua
@@ -1,6 +1,8 @@
 return {
-    "nvchad/base46",
-    build = function()
-        require("base46").load_all_highlights()
-    end,
-}
+  "folke/tokyonight.nvim",
+  lazy = false,
+  priority = 1000,
+  config = function()
+    vim.cmd.colorscheme "tokyonight"
+  end,
+}
\ No newline at end of file
diff --git a/lua/plugins/ui/ident-blankline.lua b/lua/plugins/ui/ident-blankline.lua
index bb37b0b..8c98230 100644
--- a/lua/plugins/ui/ident-blankline.lua
+++ b/lua/plugins/ui/ident-blankline.lua
@@ -1,16 +1,10 @@
 return {
     "lukas-reineke/indent-blankline.nvim",
-    event = "User FilePost",
-    opts = {
-        indent = { char = "│", highlight = "IblChar" },
-        scope = { char = "│", highlight = "IblScopeChar" },
-    },
-    config = function(_, opts)
-        dofile(vim.g.base46_cache .. "blankline")
-
-        local hooks = require "ibl.hooks"
-        hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
-        require("ibl").setup(opts)
-        dofile(vim.g.base46_cache .. "blankline")
+    event = "BufReadPost", 
+    config = function()
+        require("ibl").setup({
+            indent = { char = "│" },
+            scope = { enabled = false },
+        })
     end,
-}
+}
\ No newline at end of file
diff --git a/lua/plugins/ui/treesitter.lua b/lua/plugins/ui/treesitter.lua
index 8eff813..9753930 100644
--- a/lua/plugins/ui/treesitter.lua
+++ b/lua/plugins/ui/treesitter.lua
@@ -1,6 +1,6 @@
 pcall(function()
-    dofile(vim.g.base46_cache .. "syntax")
-    dofile(vim.g.base46_cache .. "treesitter")
+    
+    
 end)
 
 local config = {