diff --git a/after/init.lua b/after/init.lua
index 56a9e76..d8294df 100755
--- a/after/init.lua
+++ b/after/init.lua
@@ -9,3 +9,27 @@ vim.cmd[[
 highlight CursorColumn guibg=none ctermbg=none
 highlight link CursorColumn CursorLine
 ]]
+
+-- fixmap
+vim.cmd[[
+map <Space>m\ <nop>
+map <Space>m/ <nop>
+map <Space>mA <nop>
+map <Space>mgS <nop>
+
+map <Space>tt <nop>
+map <Space>tm <nop>
+]]
+
+vim.opt.nu = true
+vim.opt.number = true
+vim.opt.relativenumber = true
+
+
+vim.opt.cursorline = true
+vim.opt.cursorcolumn = true
+vim.cmd[[
+highlight CursorColumn guibg=none ctermbg=none
+highlight link CursorColumn CursorLine
+]]
+
diff --git a/after/plugin/dash.lua b/after/plugin/dash.lua
deleted file mode 100755
index d2805b5..0000000
--- a/after/plugin/dash.lua
+++ /dev/null
@@ -1,43 +0,0 @@
--- local db = require('dashboard')
--- 
-local header = {"",
-    " /$$   /$$                     /$$    /$$ /$$              ",
-    "| $$$ | $$                    | $$   | $$|__/              ",
-    "| $$$$| $$  /$$$$$$   /$$$$$$ | $$   | $$ /$$ /$$$$$$/$$$$ ",
-    "| $$ $$ $$ /$$__  $$ /$$__  $$|  $$ / $$/| $$| $$_  $$_  $$",
-    "| $$  $$$$| $$$$$$$$| $$  \\ $$ \\  $$ $$/ | $$| $$ \\ $$ \\ $$",
-    "| $$\\  $$$| $$_____/| $$  | $$  \\  $$$/  | $$| $$ | $$ | $$",
-    "| $$ \\  $$|  $$$$$$$|  $$$$$$/   \\  $/   | $$| $$ | $$ | $$",
-    "|__/  \\__/ \\_______/ \\______/     \\_/    |__/|__/ |__/ |__/",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-}
--- db.custom_header = header
--- db.custom_center = {
---     {
---         icon = '  ',
---         desc ='File Browser                            ',
---         action =  'Telescope file_browser',
---         shortcut = 'SPC e e'
---     },
--- }
-
-local dashboard = require("alpha.themes.dashboard")
-dashboard.section.header.val = header
-dashboard.section.buttons.val = {
-    dashboard.button("op", "Open Project", ":OP<cr>"),
-    dashboard.button("oc", "Open Config", ":Config<cr>"),
-}
-
--- dashboard.section.footer.opts.hl = "Constant"
--- dashboard.section.header.opts.hl = "Include"
--- dashboard.section.buttons.opts.hl = "Function"
--- dashboard.section.buttons.opts.hl_shortcut = "Type"
-dashboard.opts.opts.noautocmd = true
-
-require("alpha").setup(dashboard.opts)
diff --git a/after/plugin/fixmap.lua b/after/plugin/fixmap.lua
deleted file mode 100755
index c3080bc..0000000
--- a/after/plugin/fixmap.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-vim.cmd[[
-map <Space>m\ <nop>
-map <Space>m/ <nop>
-map <Space>mA <nop>
-map <Space>mgS <nop>
-
-map <Space>tt <nop>
-map <Space>tm <nop>
-]]
-
-vim.opt.nu = true
-vim.opt.number = true
-vim.opt.relativenumber = true
-
-
-vim.opt.cursorline = true
-vim.opt.cursorcolumn = true
-vim.cmd[[
-highlight CursorColumn guibg=none ctermbg=none
-highlight link CursorColumn CursorLine
-]]
-
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index 244e056..b6cc7cf 100755
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -118,11 +118,6 @@ mason_lspconfig.setup_handlers {
     end,
 }
 
-require("lspconfig").nimls.setup{
-    cmd = {"nimlsp", "--log", "/tmp/nimlsp.log"},
-    on_attach = on_attach,
-}
-
 require("lspconfig").zls.setup{
     cmd = {"zls"},
     on_attach = on_attach,
@@ -186,7 +181,6 @@ cmp.setup {
         end, { 'i', 's' }),
     },
     sources = {
-        { name = "otter" },
         { name = 'nvim_lsp' },
         { name = 'luasnip' },
         { name = "crates" },
@@ -204,20 +198,3 @@ vim.diagnostic.config({
     update_in_insert = true,
     virtual_text = true,
 })
-
-require("cmp").config.formatting = {
-  format = require("tailwindcss-colorizer-cmp").formatter,
-    behavior = cmp.SelectBehavior.Select,
-}
-
--- require('tabnine').setup({
---   disable_auto_comment=true,
---   accept_keymap="<Tab>",
---   dismiss_keymap = "<C-]>",
---   debounce_ms = 300,
---   suggestion_color = {gui = "#808080", cterm = 244},
---   execlude_filetypes = {"TelescopePrompt"}
--- })
-
-
-require("aerial").setup({})
diff --git a/after/plugin/neotree.lua b/after/plugin/neotree.lua
index 983ae30..916891b 100755
--- a/after/plugin/neotree.lua
+++ b/after/plugin/neotree.lua
@@ -3,8 +3,4 @@ require("neo-tree").setup({
         winbar = true,
         statusline = false,
     },
-})
-
-
-vim.keymap.set("n", "<C-\\>", vim.cmd.ToggleTerm)
-vim.keymap.set("t", "<C-\\>", vim.cmd.ToggleTerm)
+})
\ No newline at end of file
diff --git a/after/plugin/presence.lua b/after/plugin/presence.lua
deleted file mode 100755
index 4b9da7e..0000000
--- a/after/plugin/presence.lua
+++ /dev/null
@@ -1,22 +0,0 @@
---require("presence"):setup({
---    auto_update         = true,                      -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
---    neovim_image_text   = "The best PDE, Personalized Development Enviroment", -- Text displayed when hovered over the Neovim image
---    main_image          = "neovim",                   -- Main image display (either "neovim" or "file")
---    client_id           = "793271441293967371",       -- Use your own Discord application client id (not recommended)
---    log_level           = nil,                        -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
---    debounce_timeout    = 15,                         -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
---    enable_line_number  = false,                      -- Displays the current line number instead of the current project
---    blacklist           = {},                         -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
---    buttons             = true,                       -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
---    file_assets         = {},                         -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
---    show_time           = true,                       -- Show the timer
---
---    -- Rich Presence text options
---    editing_text        = "Editing %s",               -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
---    file_explorer_text  = "Browsing %s",              -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
---    git_commit_text     = "Committing changes",       -- Format string rendered when committing changes in git (either string or function(filename: string): string)
---    plugin_manager_text = "Managing plugins",         -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
---    reading_text        = "Reading %s",               -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
---    workspace_text      = "Working on %s",            -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
---    line_number_text    = "Line %s out of %s",        -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
---})
diff --git a/after/plugin/statusline.lua b/after/plugin/statusline.lua
index 68ff3a7..62a04bc 100755
--- a/after/plugin/statusline.lua
+++ b/after/plugin/statusline.lua
@@ -5,7 +5,7 @@ local colors = {
     bright_bg = utils.get_highlight("Folded").bg,
     bright_fg = utils.get_highlight("Folded").fg,
     red = utils.get_highlight("DiagnosticError").fg,
-    dark_red = utils.get_highlight("diffDelete").bg,
+    dark_red = utils.get_highlight("DiffDelete").bg,
     green = utils.get_highlight("String").fg,
     blue = utils.get_highlight("Function").fg,
     gray = utils.get_highlight("NonText").fg,
@@ -16,9 +16,9 @@ local colors = {
     diag_error = utils.get_highlight("DiagnosticError").fg,
     diag_hint = utils.get_highlight("DiagnosticHint").fg,
     diag_info = utils.get_highlight("DiagnosticInfo").fg,
-    git_del = utils.get_highlight("diffRemoved").fg,
-    git_add = utils.get_highlight("diffAdded").fg,
-    git_change = utils.get_highlight("diffChanged").fg,
+    git_del = utils.get_highlight("DiffRemoved").fg,
+    git_add = utils.get_highlight("DiffAdd").fg,
+    git_change = utils.get_highlight("DiffChanged").fg,
 }
 
 require("heirline").load_colors(colors)
@@ -437,21 +437,21 @@ local Git = {
             local count = self.status_dict.added or 0
             return count > 0 and ("+" .. count)
         end,
-        hl = { fg = "git_add" },
+        hl = { fg = "green" },
     },
     {
         provider = function(self)
             local count = self.status_dict.removed or 0
             return count > 0 and ("-" .. count)
         end,
-        hl = { fg = "git_del" },
+        hl = { fg = "red" },
     },
     {
         provider = function(self)
             local count = self.status_dict.changed or 0
             return count > 0 and ("~" .. count)
         end,
-        hl = { fg = "git_change" },
+        hl = { fg = "blue" },
     },
     {
         condition = function(self)
diff --git a/after/plugin/tabline.lua b/after/plugin/tabline.lua
deleted file mode 100755
index 90f5edd..0000000
--- a/after/plugin/tabline.lua
+++ /dev/null
@@ -1,29 +0,0 @@
--- require("bufferline").setup {
---     animation = true,
---     auto_hide = true,
---     tabpages = true,
---     closable = true,
---     clickable = true,
---     separator_style = "slant",
---     numbers = "buffer_id",
--- }
---
--- -- file sidebars
--- local nvim_tree_events = require("nvim-tree.events")
--- local bufferline_api = require("bufferline.api")
---
--- local function get_tree_size()
---   return require"nvim-tree.view".View.width
--- end
---
--- nvim_tree_events.subscribe("TreeOpen", function()
---   bufferline_api.set_offset(get_tree_size())
--- end)
---
--- nvim_tree_events.subscribe("Resize", function()
---   bufferline_api.set_offset(get_tree_size())
--- end)
---
--- nvim_tree_events.subscribe("TreeClose", function()
---   bufferline_api.set_offset(0)
--- end)
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
index f74ad36..94b7dfe 100755
--- a/after/plugin/telescope.lua
+++ b/after/plugin/telescope.lua
@@ -2,7 +2,7 @@ require "telescope".setup {
     extensions = {
         workspaces = {
             keep_insert = true,
-      }
+        }
     },
     pickers = {
         colorscheme = {
@@ -13,6 +13,4 @@ require "telescope".setup {
 
 pcall(require("telescope").load_extension, "fzf")
 require("telescope").load_extension("dap")
-require('telescope').load_extension('projects')
-require("telescope").load_extension("workspaces")
 require("telescope").load_extension("harpoon")
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
index d5fd570..610bd29 100755
--- a/after/plugin/treesitter.lua
+++ b/after/plugin/treesitter.lua
@@ -17,8 +17,17 @@ require"nvim-treesitter.configs".setup {
             node_decremental = "grm",
         },
     },
+    rainbow = {
+        enable = true,
+        -- list of languages you want to disable the plugin for
+        disable = {},
+        -- Which query to use for finding delimiters
+        query = 'rainbow-parens',
+        -- Highlight the entire buffer all at once
+        strategy = require('ts-rainbow').strategy.global,
+    },
 }
 
-vim.wo.foldmethod = "expr"
+vim.wo.foldmethod = "manual"
 vim.wo.foldexpr = "nvim_treesitter#foldexpr()"
 vim.o.foldlevelstart = 99 -- do not close folds when a buffer is opened
diff --git a/lazy-lock.json b/lazy-lock.json
deleted file mode 100644
index 3fcf26b..0000000
--- a/lazy-lock.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "Ionide-vim": { "branch": "master", "commit": "8435bae84b26b602dbb68399661b3989915cc4d3" },
-  "LspUI.nvim": { "branch": "legacy", "commit": "a9447e0131c4e34b3003f5da4a3026da49fb0db2" },
-  "LuaSnip": { "branch": "master", "commit": "3657c3f3cb2214a681fc7e95b6ffb509d076ebfb" },
-  "adwaita.nvim": { "branch": "main", "commit": "bb421a3439a515862ecb57970f10722cdcc4d089" },
-  "aerial.nvim": { "branch": "master", "commit": "22ed2f75eb54d2312105105d786bdea16648b2f2" },
-  "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" },
-  "catppuccin": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" },
-  "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" },
-  "close-buffers.nvim": { "branch": "master", "commit": "3acbcad1211572342632a6c0151f839e7dead27f" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
-  "copilot.lua": { "branch": "master", "commit": "2c942f33ba5c621c906e625e00a1bb504b65e2f0" },
-  "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
-  "dotnet.nvim": { "branch": "main", "commit": "98fefe5e63e09391dd426430647a999810c4cfcc" },
-  "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" },
-  "editorconfig-vim": { "branch": "master", "commit": "aefcf3d735122f349b172302d164d5eb61cd7e5f" },
-  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" },
-  "github-nvim-theme": { "branch": "main", "commit": "bf4cd7e05ff1ac9a301edcd5051b9cd7f5c81f0d" },
-  "gitsigns.nvim": { "branch": "main", "commit": "bce4576a9047085a528c479a7fe1e2f6b787b6c1" },
-  "glow.nvim": { "branch": "main", "commit": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5" },
-  "goto-preview": { "branch": "main", "commit": "84532db88f8ee272bcd1c07cda55884e23fd9087" },
-  "gruvbox-baby": { "branch": "main", "commit": "4f45f5182b986ea8099b8ad0207e07f1bc49a47f" },
-  "gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" },
-  "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" },
-  "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
-  "heirline.nvim": { "branch": "master", "commit": "7f1e805dfc001d5dbb7d894105063f463f6c7dcc" },
-  "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
-  "kanagawa.nvim": { "branch": "master", "commit": "a4e99f089110c6d00bc33f5497709200e914e763" },
-  "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
-  "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" },
-  "lsp-lens.nvim": { "branch": "main", "commit": "13d25ad8bd55aa34cc0aa3082e78a4157c401346" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "51784ba4ce87b362c139b8c2db6583c0aec20536" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "f014db32437aa61c86fc0ef1067cd2bc6a37205c" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" },
-  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
-  "material.nvim": { "branch": "main", "commit": "1ecaa2d065a1ea308bd7702a77c2bf35ede8f536" },
-  "mellow.nvim": { "branch": "main", "commit": "6e5845571d4543b282cf915f2410c5b77064c014" },
-  "mesonic": { "branch": "master", "commit": "b7e8e4ed41c49c671ce424c0697aa9c08af0805d" },
-  "mini.nvim": { "branch": "main", "commit": "e2273ec6186a7af206cc73de10970c0c3867c46d" },
-  "minimal.nvim": { "branch": "main", "commit": "22d837b814d3bd22625640ef63cc73b8507f291d" },
-  "mojo.vim": { "branch": "main", "commit": "1fcea1b5c77bedfff41bebc7db98328da8da0bef" },
-  "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
-  "neodev.nvim": { "branch": "main", "commit": "471324e6c746284dbbdc1d357799d1911bb7e120" },
-  "neofsharp.vim": { "branch": "master", "commit": "f28bb9665fa859be8543b9828b477dd932743827" },
-  "neogit": { "branch": "master", "commit": "1b6edb56e8c754494be1564912d33e50ddd8a023" },
-  "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" },
-  "nerdtree": { "branch": "master", "commit": "32168889bdbc1e7d1d313e3e41c1cc794b38eac5" },
-  "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" },
-  "nim.nvim": { "branch": "master", "commit": "87afde2ae995723e0338e1851c3b3c1cbd81d955" },
-  "nnn.nvim": { "branch": "master", "commit": "4616ec65eb0370af548e356c3ec542c1b167b415" },
-  "nord.nvim": { "branch": "master", "commit": "15fbfc38a83980b93e169b32a1bf64757f1e2bf4" },
-  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
-  "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" },
-  "nvim": { "branch": "main", "commit": "9a0e695fdd57b340d3ba2b72406e3ca519029f25" },
-  "nvim-autopairs": { "branch": "master", "commit": "defad64afbf19381fe31488a7582bbac421d6e38" },
-  "nvim-bqf": { "branch": "main", "commit": "a906a9dfc1bd7b3ac51ac954e32e157ffad9a7cd" },
-  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
-  "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" },
-  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
-  "nvim-jdtls": { "branch": "master", "commit": "697b39e3db0e0d0ce9ee4c2df506a4e0386af6c2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "cc388d3f6b9c7c943ae2b2dcd46ad470fd257f91" },
-  "nvim-navbuddy": { "branch": "master", "commit": "f137a3466a6cd1965cdcc5398daff54e66eebbe5" },
-  "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" },
-  "nvim-notify": { "branch": "master", "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" },
-  "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" },
-  "nvim-surround": { "branch": "main", "commit": "1c2ef599abeeb98e40706830bcd27e90e259367a" },
-  "nvim-tree.lua": { "branch": "master", "commit": "a3aa3b47eac8b6289f028743bef4ce9eb0f6782e" },
-  "nvim-treesitter": { "branch": "master", "commit": "6f3f89a6dded8f89ddf6e32bbd88efcb9d7c0dce" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
-  "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
-  "nvim-web-devicons": { "branch": "master", "commit": "973ab742f143a796a779af4d786ec409116a0d87" },
-  "nvim-window-picker": { "branch": "main", "commit": "1b1bb834b0acb9eebb11a61664efc665757f1ba2" },
-  "oh-lucy.nvim": { "branch": "main", "commit": "706c74fe8dcc2014dc17bbc861a05d27623e06e3" },
-  "oil.nvim": { "branch": "master", "commit": "da0553067e0982d92facf2f2ef1f709b97aed02e" },
-  "one_monokai.nvim": { "branch": "main", "commit": "cb45ecb019be679e32373896bb42545818b6d884" },
-  "onedarkpro.nvim": { "branch": "main", "commit": "15c9b5b4ff38b3dcde4370e0a1ce12b927451dd4" },
-  "onenord.nvim": { "branch": "main", "commit": "5d4ea147564f6a5e5a2aea643c1fae15acb66b90" },
-  "otter.nvim": { "branch": "main", "commit": "2752dd199d73342f13a1bd599a99822505e2803f" },
-  "overseer.nvim": { "branch": "master", "commit": "2749d8893a069a0020eba3ddbc26f1624a57d7b3" },
-  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
-  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" },
-  "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "rainbow_csv.nvim": { "branch": "main", "commit": "7318d7b4e52029b291d28bfb48d8d2c6809f78d3" },
-  "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
-  "screensaver.vim": { "branch": "master", "commit": "2fce86da020f762608e7a4fc221fdde220301105" },
-  "smart-splits.nvim": { "branch": "master", "commit": "0beb14427dcf2a5d5d63e0064b45032a7bd3e763" },
-  "sonokai": { "branch": "master", "commit": "17308ee6d9c764bfc1e0fa97213e7a99701b4144" },
-  "sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" },
-  "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
-  "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" },
-  "telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" },
-  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "toggleterm.nvim": { "branch": "main", "commit": "b90a1381e9b5b8596f49070ee86c71db267ac868" },
-  "tokyodark.nvim": { "branch": "master", "commit": "4bfb42924274abc5de9f5f4779075b77c6112c85" },
-  "transparent.nvim": { "branch": "main", "commit": "3af6232c8d39d51062702e875ff6407c1eeb0391" },
-  "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
-  "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" },
-  "vim-cmake": { "branch": "master", "commit": "6b7b18130c30e1d498c0ec8fca3c18951273e4ea" },
-  "vim-css-color": { "branch": "master", "commit": "6cc65734bc7105d9677ca54e2255fcbc953ba6bf" },
-  "vim-fugitive": { "branch": "master", "commit": "7679842b904aa7d290087a52c35229ffe8e7b218" },
-  "vim-glsl": { "branch": "master", "commit": "bfd330a271933c3372fcfa8ce052970746c8e9dd" },
-  "vim-nerdtree-tabs": { "branch": "master", "commit": "07d19f0299762669c6f93fbadb8249da6ba9de62" },
-  "vim-racer": { "branch": "master", "commit": "d1aead98a936cd8165b3329511d7c987226eb3a6" },
-  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
-  "vim-sanegx": { "branch": "master", "commit": "e97c10401d781199ba1aecd07790d0771314f3f5" },
-  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
-  "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" },
-  "vim-table-mode": { "branch": "master", "commit": "9555a3e6e5bcf285ec181b7fc983eea90500feb4" },
-  "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" },
-  "vim-vue": { "branch": "master", "commit": "c424294e769b26659176065f9713c395731f7b3a" },
-  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
-  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" },
-  "workspaces.nvim": { "branch": "master", "commit": "a6fb4995333f927cc6f707890800fa7f7c476043" },
-  "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" },
-  "zig-tools.nvim": { "branch": "master", "commit": "78a85278fe5d480da2f01df4db898757d7e953b5" },
-  "zig.vim": { "branch": "master", "commit": "15841fc4fecfb1b6c02da9b4cc17ced135edbf8e" }
-}
\ No newline at end of file
diff --git a/lua/config/commands.lua b/lua/config/commands.lua
index 4711514..3dfe5e8 100644
--- a/lua/config/commands.lua
+++ b/lua/config/commands.lua
@@ -21,8 +21,6 @@ vim.api.nvim_create_user_command("OP", function ()
                 local selection = action_state.get_selected_entry()
                 selection = selection[1]
                 vim.cmd("cd $HOME/projects/" .. selection)
-                vim.cmd("Alpha")
-                vim.cmd("BWipeout other")
             end)
             return true
         end
@@ -46,8 +44,6 @@ vim.api.nvim_create_user_command("OCC", function ()
                 local selection = action_state.get_selected_entry()
                 selection = selection[1]
                 vim.cmd("cd $HOME/projects/cc/" .. selection)
-                vim.cmd("Alpha")
-                vim.cmd("BWipeout other")
             end)
             return true
         end
@@ -71,8 +67,6 @@ vim.api.nvim_create_user_command("OD", function ()
                 local selection = action_state.get_selected_entry()
                 selection = selection[1]
                 vim.cmd("cd " .. selection)
-                vim.cmd("Alpha")
-                vim.cmd("BWipeout other")
             end)
             return true
         end
@@ -81,12 +75,6 @@ end, {})
 
 vim.api.nvim_create_user_command("Config", function ()
     vim.cmd("cd $HOME/.config/nvim")
-    vim.cmd("Alpha")
-    vim.cmd("BWipeout other")
-end, {})
-
-vim.api.nvim_create_user_command("O", function ()
-    require("oil").open_float(vim.fn.getcwd())
 end, {})
 
 vim.api.nvim_create_user_command("RetabFile", function ()
diff --git a/lua/config/keymap.lua b/lua/config/keymap.lua
index b5842ac..4e6c6b2 100644
--- a/lua/config/keymap.lua
+++ b/lua/config/keymap.lua
@@ -10,11 +10,9 @@ local keys = {
         b = {"<cmd>NeoTreeFloatToggle buffers<CR>", "Buffers"},
         c = {"<cmd>NeoTreeClose<CR>" , "Close"},
         u = {vim.cmd.UndotreeToggle, "UndoTree"},
-        o = {function () require("oil").open_float(vim.fn.getcwd()) end, "Oil"},
     },
     c = {
         name = "LSP",
-        S = {vim.cmd.AerialToggle, "Symbol sidebar"},
         w = {function () vim.lsp.buf.workspace_symbol("") end, "workspace symbol"},
         d = {function () vim.diagnostic.open_float() end, "diagnostic"},
         a = {function () vim.lsp.buf.code_action() end, "code actions"},
@@ -23,15 +21,7 @@ local keys = {
         h = {function () vim.lsp.buf.hover() end, "Hover"},
         t = {function () vim.lsp.buf.type_definition() end,"Type Definition"},
         s = {"<cmd>Navbuddy<cr>", "Navbuddy"},
-        -- s = {require("telescope.builtin").lsp_document_symbols, "Document Symbols"},
-        g = {
-            name = "Goto Preview",
-            d = {function () require('goto-preview').goto_preview_definition() end, "Definition"},
-            r = {function () require('goto-preview').goto_preview_references() end, "References"},
-            t = {function () require("goto-preview").goto_preview_type_definitions() end, "Type"},
-            i = {function () require("goto-preview").goto_preview_implementation() end, "Implementation"},
-            c = {function () require("goto-preview").close_all_win() end, "Close"},
-        },
+        S = {require("telescope.builtin").lsp_document_symbols, "Document Symbols"},
         l = {
             name = "LSP",
             k = {"<cmd>LspStop<cr>", "Stop"},
@@ -48,12 +38,6 @@ local keys = {
             p = {"<cmd>Copilot suggestion prev<cr>", "Previous"},
         }
     },
-    q = {
-        name = "Nvim",
-        q = {"<cmd>q<cr>", "Quit"},
-        W = {"<cmd>wq<cr>", "Save and Quit"},
-        w = {"<cmd>w<cr>", "Save"},
-    },
     b = {
         name = "Buffer",
         h = {vim.cmd.bprevious, "Previous"},
@@ -73,14 +57,13 @@ local keys = {
         b = {require("telescope.builtin").buffers, "buffers"},
         h = {require("telescope.builtin").help_tags, "help tags"},
         s = {function () require("telescope.builtin").grep_string({ search = vim.fn.input("Grep > ")}); end, "grep search through files"},
-        p = {"<cmd>Telescope projects<cr>", "Projects"},
     },
     s = {
         name = "Settings",
         c = {function ()
             vim.opt.scrolloff = 100
         end, "Always center cursor"},
-        x = {function ()
+        C = {function ()
             vim.opt.scrolloff = 8
         end, "Disable Cursor center"},
         f = {function ()
@@ -144,6 +127,7 @@ vim.keymap.set("i", "<C-h>", function () vim.lsp.buf.hover() end, {})
 -- term
 vim.keymap.set("n", "<C-\\>", vim.cmd.ToggleTerm)
 vim.keymap.set("t", "<C-\\>", vim.cmd.ToggleTerm)
+vim.keymap.set("v", "<C-\\>", vim.cmd.ToggleTerm)
 
 -- center
 vim.keymap.set("n", "<C-d>", "<C-d>zz")
@@ -178,4 +162,6 @@ vim.keymap.set('i', '<C-Space>f?', require('telescope.builtin').oldfiles, { desc
 
 for i = 9, 1, -1 do
     vim.keymap.set("n", "<M-" .. i .. ">", function() require("harpoon.ui").nav_file(i) end, {desc = ""})
+    vim.keymap.set("i", "<M-" .. i .. ">", function() require("harpoon.ui").nav_file(i) end, {desc = ""})
+    vim.keymap.set("v", "<M-" .. i .. ">", function() require("harpoon.ui").nav_file(i) end, {desc = ""})
 end
diff --git a/lua/config/packages.lua b/lua/config/packages.lua
index af0aed1..e2bc027 100644
--- a/lua/config/packages.lua
+++ b/lua/config/packages.lua
@@ -8,11 +8,6 @@ return {
             "folke/neodev.nvim",
         },
     },
-    {
-        "jinzhongjia/LspUI.nvim",
-        config = true,
-        branch = "legacy",
-    },
     {
         "VidocqH/lsp-lens.nvim",
         config = true,
@@ -34,7 +29,6 @@ return {
         event = "BufRead",
         config = function() require"lsp_signature".on_attach() end,
     },
-    {'stevearc/aerial.nvim', config = true},
     {
         "hrsh7th/nvim-cmp",
         dependencies = {
@@ -47,10 +41,6 @@ return {
             "rafamadriz/friendly-snippets"
         },
     },
-    {
-        "roobert/tailwindcss-colorizer-cmp.nvim",
-        opts = {color_square_width = 2},
-    },
 
     -- syntax highlighting
     {
@@ -90,83 +80,35 @@ return {
     "nvim-telescope/telescope-dap.nvim",
 
     -- git
-    {
-        "NeogitOrg/neogit",
-        dependencies = {
-            "nvim-lua/plenary.nvim"
-        },
-        config=true,
-    },
-    "tpope/vim-fugitive",
-    "tpope/vim-rhubarb",
     "lewis6991/gitsigns.nvim",
 
     "lvimuser/lsp-inlayhints.nvim",
-    "s1n7ax/nvim-window-picker",
     "echasnovski/mini.nvim",
-    {
-        'stevearc/oil.nvim',
-        opts = {
-            columns = {
-                "icon",
-                "permissions",
-                "size",
-            },
-            -- keymap = {
-            --     ["<C-c>"] = "actions.close",
-            -- },
-            view_options = {
-                show_hidden = true,
-            },
-        }
-    },
-    "ThePrimeagen/vim-be-good",
     {'kazhala/close-buffers.nvim', config = true},
---    {
---        "VonHeikemen/fine-cmdline.nvim",
---        dependencies = {{"MunifTanjim/nui.nvim"}},
---        config = function()
---            require("fine-cmdline").setup({
---                cmdline = {
---                    prompt = ">",
---                }
---            })
---            vim.api.nvim_set_keymap('n', ':', '<cmd>FineCmdline<CR>', {noremap = true})
---        end
---    },
-    'stevearc/dressing.nvim',
+    {'stevearc/dressing.nvim', opts = {}},
     {
-        'stevearc/overseer.nvim',
+        'anuvyklack/pretty-fold.nvim',
         opts = {
-            strategy = "toggleterm",
+            keep_indentation = true,
+            fill_char = '━',
+            sections = {
+                left = {
+                    '━ ', function() return string.rep('*', vim.v.foldlevel) end, ' ━┫', 'content', '┣'
+                },
+                right = {
+                    '┫ ', 'number_of_folded_lines', ': ', 'percentage', ' ┣━━',
+                }
+            }
         }
     },
-    "itchyny/screensaver.vim",
-    'anuvyklack/pretty-fold.nvim',
-    'eandrju/cellular-automaton.nvim',
-    "ahmedkhalf/project.nvim",
-    "dhruvasagar/vim-table-mode",
     "editorconfig/editorconfig-vim",
-    "andweeb/presence.nvim",
-    "nacro90/numb.nvim",
-    {"ellisonleao/glow.nvim", config = true, cmd = "Glow"},
+    {"nacro90/numb.nvim", opts = {}},
     {"kylechui/nvim-surround", opts={}},
     {
         "phaazon/hop.nvim",
         event = "BufRead",
         opts = {}
     },
-    {
-        "nvim-tree/nvim-tree.lua",
-        dependencies = {
-            "nvim-tree/nvim-web-devicons",
-        },
-        opts = {
-            filters = {
-                dotfiles = true,
-            },
-        }
-    },
     {
         "ThePrimeagen/harpoon"
     },
@@ -182,19 +124,6 @@ return {
             ["border"] = "rounded",
         },
     },
-    {
-        "natecraddock/workspaces.nvim",
-        opts = {
-            auto_open = true,
-            hooks = {
-                add = {},
-                remove = {},
-                rename = {},
-                open_pre = {},
-                open = {},
-            },
-        }
-    },
     "lambdalisue/suda.vim",
     "tpope/vim-sleuth",
     "mbbill/undotree",
@@ -216,24 +145,12 @@ return {
             filetypes = {'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'svelte', 'vue', 'tsx', 'jsx', 'rescript', 'xml', 'php', 'markdown', 'astro', 'glimmer', 'handlebars', 'hbs', "rust" },
         },
     },
-    {
-        'bennypowers/nvim-regexplainer',
-        dependencies = {
-            'nvim-treesitter/nvim-treesitter',
-            'MunifTanjim/nui.nvim',
-        }
-    },
     {
         "rcarriga/nvim-notify", 
         config = function ()
             vim.notify = require("notify")
         end
     },
-    'nmac427/guess-indent.nvim',
-    'mrjones2014/smart-splits.nvim',
-    "goolord/alpha-nvim",
-    "preservim/nerdtree",
-    "luukvbaal/nnn.nvim",
     {
         "nvim-neo-tree/neo-tree.nvim",
         branch = "v2.x",
@@ -243,7 +160,6 @@ return {
             "MunifTanjim/nui.nvim",
         },
     },
-    "jistr/vim-nerdtree-tabs",
     {
         "kevinhwang91/nvim-bqf",
         event = { "BufRead", "BufNew" },
@@ -269,13 +185,11 @@ return {
             }
     },
     "nvim-tree/nvim-web-devicons",
-    "ap/vim-css-color",
     {
         "lukas-reineke/indent-blankline.nvim",
         opts = {
             char = '┊',
             show_trailing_blankline_indent = false,
-            filetype_exclude = {"dashboard"},
             show_end_of_line = true,
             show_current_context = true,
             show_current_context_start = true, 
@@ -340,11 +254,6 @@ return {
             window = {border="rounded",},
         }
     },
-    'rmagatti/goto-preview',
-    {
-        "felipec/vim-sanegx",
-        event = "BufRead",
-    },
     {
         "gelguy/wilder.nvim",
         config = function()
@@ -353,7 +262,6 @@ return {
             vim.cmd('call wilder#set_option("renderer", wilder#popupmenu_renderer(wilder#popupmenu_border_theme({"highlighter": wilder#basic_highlighter(), "min_width": "100%", "min_height": "50%", "reverse": 0, "highlights": {"border": "Normal",},"border": "rounded"})))')
         end,
     },
-
     {
         "zbirenbaum/copilot.lua",
         opts = {
@@ -363,20 +271,25 @@ return {
         },
     },
 
-    -- language mixing also OTTER
+    {"tpope/vim-dadbod"},
     {
-        "jmbuhr/otter.nvim",
+        "kristijanhusak/vim-dadbod-ui",
         dependencies = {
-            'hrsh7th/nvim-cmp',
-            'neovim/nvim-lspconfig',
-            'nvim-treesitter/nvim-treesitter'
+            { 'tpope/vim-dadbod', lazy = true },
+            { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true },
         },
+        cmd = {
+            'DBUI',
+            'DBUIToggle',
+            'DBUIAddConnection',
+            'DBUIFindBuffer',
+        },
+        init = function()
+            vim.g.db_ui_use_nerd_fonts = 1
+        end
     },
 
     -- lenguage specific
-    -- nim
-    "alaviss/nim.nvim",
-
     -- csv
     'cameron-wags/rainbow_csv.nvim',
 
@@ -416,93 +329,18 @@ return {
     "mfussenegger/nvim-jdtls",
 
     -- c && c++ && cmake
-    { "igankevich/mesonic",
-        config = function()
-            vim.cmd[[
-            let b:meson_command = 'meson'
-            let b:meson_ninja_command = 'ninja'
-
-            autocmd FileType c call ConsiderMesonForLinting()
-            function ConsiderMesonForLinting()
-                if filereadable('meson.build')
-                    let g:syntastic_c_checkers = ['meson']
-                endif
-            endfunction
-            ]]
-        end
-    },
     "cdelledonne/vim-cmake",
 
-    -- web
-    "evanleck/vim-svelte",
-    "posva/vim-vue",
-
-    -- yuck
-    "elkowar/yuck.vim",
-
-
-    -- f#
-    "adelarsq/neofsharp.vim",
-    {
-        "ionide/Ionide-vim",
-        config = function ()
-            vim.cmd [[
-            let g:fsharp#backend = "nvim"
-            ]]
-        end
-    },
-    "aurum77/dotnet.nvim",
-
-    -- mojo
-    {
-        "czheo/mojo.vim",
-        init = function()
-            vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, {
-                pattern = { "*.🔥" },
-                callback = function()
-                    if vim.bo.filetype ~= "mojo" then
-                        vim.bo.filetype = "mojo"
-                    end
-                end,
-            })
-
-            vim.api.nvim_create_autocmd("FileType", {
-                pattern = "mojo",
-                callback = function()
-                    local modular = vim.env.MODULAR_HOME
-                    local lsp_cmd = modular .. "/pkg/packages.modular.com_mojo/bin/mojo-lsp-server"
-
-                    vim.bo.expandtab = true
-                    vim.bo.shiftwidth = 4
-                    vim.bo.softtabstop = 4
-
-                    vim.lsp.start({
-                        name = "mojo",
-                        cmd = { lsp_cmd },
-                    })
-                end,
-            })
-        end,
-    },
-
     -- themes
     "xiyaowong/transparent.nvim",
 
-    "sainnhe/gruvbox-material",
-    "shaunsingh/nord.nvim",
-    "projekt0n/github-nvim-theme",
     "EdenEast/nightfox.nvim",
-    "Everblush/nvim",
-    "olimorris/onedarkpro.nvim",
-    "rmehri01/onenord.nvim",
     "luisiacc/gruvbox-baby",
     "tiagovla/tokyodark.nvim",
     "cpea2506/one_monokai.nvim",
     "yazeed1s/minimal.nvim",
-    "Mofiqul/adwaita.nvim",
     "kvrohit/mellow.nvim",
     "yazeed1s/oh-lucy.nvim",
-    "marko-cerovac/material.nvim",
     "sainnhe/sonokai",
     "rebelot/kanagawa.nvim",
     { 
@@ -538,7 +376,6 @@ return {
                 --     }
                 }
             }
-            vim.cmd("colorscheme catppuccin")
         end
     },
 }
diff --git a/lua/config/pmstrap.lua b/lua/config/pmstrap.lua
index df901f2..85d64f8 100644
--- a/lua/config/pmstrap.lua
+++ b/lua/config/pmstrap.lua
@@ -18,7 +18,7 @@ require("lazy").setup("config.packages", {
     defaults = {
         lazy = false
     },
-    -- install = {
-    --     colorscheme = { "catppuccin" },
-    -- }
-})
\ No newline at end of file
+    install = {
+        colorscheme = { "carbonfox" },
+    }
+})
diff --git a/lua/config/sets.lua b/lua/config/sets.lua
index d910423..bab8421 100644
--- a/lua/config/sets.lua
+++ b/lua/config/sets.lua
@@ -31,7 +31,7 @@ vim.o.smartcase = true
 
 -- colors
 vim.opt.termguicolors = true
-vim.cmd("colorscheme catppuccin")
+vim.cmd("colorscheme carbonfox")
 
 vim.opt.cursorline = true
 vim.opt.cursorcolumn = true
@@ -52,6 +52,3 @@ vim.o.mouse = "a"
 vim.opt.showmode = false
 
 vim.o.completeopt = "menuone,noselect"
-
--- idfk pls fix nim
-vim.opt.path = vim.opt.path + "/home/d/.nimble/bin/**"
\ No newline at end of file