diff --git a/lazy-lock.json b/lazy-lock.json
index 7622429..f935e75 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,33 +1,41 @@
 {
   "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" },
+  "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
+  "alpha-nvim": { "branch": "main", "commit": "355fbb81a59637a8963cf5847074f8c44dbef11f" },
   "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "codeium.vim": { "branch": "main", "commit": "0b74f274b82c00eaad4b5b5cd8b2e76f872d19f1" },
-  "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" },
+  "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
+  "github-preview.nvim": { "branch": "main", "commit": "b1f286a0c2c5bfcc0fea467decbb73e657428065" },
+  "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
   "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
   "none-ls.nvim": { "branch": "main", "commit": "cfa65d86e21eeb60544d5e823f6db43941322a53" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
   "nvim": { "branch": "main", "commit": "18bab5ec4c782cdf7d7525dbe89c60bfa02fc195" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ff97d376b1d22b2eaf9274605531babf0cd0cf21" },
+  "nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "e5a05ba5e298cc1e1dad8eb8095b8d4d89a7f793" },
+  "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" },
   "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
   "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" },
   "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "refactoring.nvim": { "branch": "master", "commit": "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" },
+  "termim.nvim": { "branch": "main", "commit": "58344167abb97bcef9bf720a762ea653a94e9daa" },
   "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "1420fb9e07b1d80cc6d87e7d90827fb2c1109cb3" },
   "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
 }
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index f4d05d0..dcf6554 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -25,21 +25,34 @@ vim.keymap.set('n', '<leader>q', ':BufferClose<CR>')
 vim.keymap.set('n', '<leader>/', 'gcc', { remap = true })
 
 -- terminal
-vim.keymap.set('n', '<leader>tr', ':ToggleTerm<CR>')
+vim.keymap.set('n', '<leader>tv', ':Vterm<CR>')  -- Vertical terminal
+vim.keymap.set('n', '<leader>th', ':Sterm<CR>')  -- Horizontal terminal
+vim.keymap.set('n', '<leader>tf', ':Fterm<CR>')  -- Floating terminal
 
 -- File Explorer
 vim.keymap.set('n', '<leader>e', function()
     require('oil').toggle_float()
 end)
 
+-- Primeagen Refactoring
+-- vim.keymap.set("x", "<leader>re", ":Refactor extract ")
+-- vim.keymap.set("x", "<leader>rf", ":Refactor extract_to_file ")
+-- vim.keymap.set("x", "<leader>rv", ":Refactor extract_var ")
+-- vim.keymap.set({ "n", "x" }, "<leader>ri", ":Refactor inline_var")
+-- vim.keymap.set( "n", "<leader>rI", ":Refactor inline_func")
+-- vim.keymap.set("n", "<leader>rb", ":Refactor extract_block")
+-- vim.keymap.set("n", "<leader>rbf", ":Refactor extract_block_to_file")
+
+
 -- Clear search, diff update and redraw
 vim.keymap.set({ 'i', 'n' }, '<esc>', '<cmd>noh<cr><esc>', { desc = 'Escape and clear hlsearch' })
 
--- Move to window using the <ctrl> hjkl keys
-vim.keymap.set('n', '<C-h>', '<C-w>h', { desc = 'Go to Left Window', remap = true })
-vim.keymap.set('n', '<C-j>', '<C-w>j', { desc = 'Go to Lower Window', remap = true })
-vim.keymap.set('n', '<C-k>', '<C-w>k', { desc = 'Go to Upper Window', remap = true })
-vim.keymap.set('n', '<C-l>', '<C-w>l', { desc = 'Go to Right Window', remap = true })
+-- Navigator
+vim.keymap.set('n', '<C-h>', '<cmd>NavigatorLeft<cr>', { desc = 'Move Left'  })
+vim.keymap.set('n', '<C-j>', '<cmd>NavigatorDown<cr>', { desc = 'Move Down' })
+vim.keymap.set('n', '<C-k>', '<cmd>NavigatorUp<cr>', { desc = 'Move Up' })
+vim.keymap.set('n', '<C-l>', '<cmd>NavigatorRight<cr>', { desc = 'Move Right' })
+vim.keymap.set('n', '<C-\\>', '<cmd>NavigatorPrevious<cr>', { desc = 'Previous Panel' })
 
 -- Move with shift-arrows
 vim.keymap.set('n', '<S-Left>', '<C-w><S-h>', {
@@ -65,40 +78,3 @@ vim.keymap.set('n', '<C-Right>', '<cmd>vertical resize +2<cr>', { desc = 'Increa
 vim.keymap.set('n', '<leader>mu', function()
     require('notify').dismiss({ silent = true, pending = true })
 end, { desc = 'Dismiss All Notifications' })
-
--- Harpoon Keybinds
--- Open harpoon ui
-vim.keymap.set('n', '<leader>ho', function()
-    harpoon_ui.toggle_quick_menu()
-end)
-
--- Add current file to harpoon
-vim.keymap.set('n', '<leader>ha', function()
-    harpoon.mark.add_file()
-end)
-
--- Remove current file from harpoon
-vim.keymap.set('n', '<leader>hr', function()
-    harpoon.mark.rm_file()
-end)
-
--- Quickly jump to harpooned files
-vim.keymap.set('n', '<leader>1', function()
-    harpoon.ui.nav_file(1)
-end)
-
-vim.keymap.set('n', '<leader>2', function()
-    harpoon.ui.nav_file(2)
-end)
-
-vim.keymap.set('n', '<leader>3', function()
-    harpoon.ui.nav_file(3)
-end)
-
-vim.keymap.set('n', '<leader>4', function()
-    harpoon.ui.nav_file(4)
-end)
-
-vim.keymap.set('n', '<leader>5', function()
-    harpoon.ui.nav_file(5)
-end)
diff --git a/lua/plugins.lua b/lua/plugins.lua
index a564707..0658aee 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1 +1,20 @@
-return {}
+return {
+    -- Markdown Preview
+    {
+        'wallpants/github-preview.nvim',
+        cmd = { 'GithubPreviewToggle' },
+        keys = { '<leader>mpt' },
+        opts = {
+            -- config goes here
+        },
+        config = function(_, opts)
+            local gpreview = require('github-preview')
+            gpreview.setup(opts)
+
+            local fns = gpreview.fns
+            vim.keymap.set('n', '<leader>mpt', fns.toggle)
+            vim.keymap.set('n', '<leader>mps', fns.single_file_toggle)
+            vim.keymap.set('n', '<leader>mpd', fns.details_tags_toggle)
+        end,
+    },
+}
diff --git a/lua/plugins/alpha.lua b/lua/plugins/alpha.lua
new file mode 100644
index 0000000..8e3e534
--- /dev/null
+++ b/lua/plugins/alpha.lua
@@ -0,0 +1,107 @@
+--- @type LazyPluginSpec
+return {
+    "goolord/alpha-nvim",
+    event = "VimEnter",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    opts = function()
+        local dashboard = require("alpha.themes.dashboard")
+        require("alpha.term")
+        local arttoggle = false
+
+        local logo = {
+            [[                                                    ]],
+            [[ ███╗   ██╗███████╗ ██████╗ ██╗   ██╗██╗███╗   ███╗ ]],
+            [[ ████╗  ██║██╔════╝██╔═══██╗██║   ██║██║████╗ ████║ ]],
+            [[ ██╔██╗ ██║█████╗  ██║   ██║██║   ██║██║██╔████╔██║ ]],
+            [[ ██║╚██╗██║██╔══╝  ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ]],
+            [[ ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ]],
+            [[ ╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝ ]],
+            [[                                                    ]],
+        }
+
+        local art = {
+            -- { name, width, height }
+            { "tohru", 62, 17 },
+        }
+
+        if arttoggle == true then
+            dashboard.opts.opts.noautocmd = true
+            dashboard.section.terminal.opts.redraw = true
+            local path = vim.fn.stdpath("config") .. "/assets/"
+            -- local random = math.random(1, #art)
+            local currentart = art[1]
+            dashboard.section.terminal.command = "cat " .. path .. currentart[1]
+
+            dashboard.section.terminal.width = currentart[2]
+            dashboard.section.terminal.height = currentart[3]
+
+            dashboard.opts.layout = {
+                dashboard.section.terminal,
+                { type = "padding", val = 2 },
+                dashboard.section.buttons,
+                dashboard.section.footer,
+            }
+        else
+            dashboard.section.header.val = logo
+        end
+        dashboard.section.buttons.val = {
+            dashboard.button("ff", " " .. " Find files", ":Telescope find_files <CR>"),
+            dashboard.button("of", " " ..  " Recent files", ":Telescope oldfiles <CR>"),
+            dashboard.button("l", "󰒲 " ..  " Lazy", ":Lazy <CR>"),
+            dashboard.button("q", " " ..  " Quit", ":q <CR>"),
+        }
+        for _, button in ipairs(dashboard.section.buttons.val) do
+            button.opts.hl = "AlphaButtons"
+            button.opts.hl_shortcut = "AlphaShortcut"
+        end
+        dashboard.section.header.opts.hl = "Function"
+        dashboard.section.buttons.opts.hl = "Identifier"
+        dashboard.section.footer.opts.hl = "Function"
+        dashboard.opts.layout[1].val = 4
+        return dashboard
+    end,
+    config = function(_, dashboard)
+        if vim.o.filetype == "lazy" then
+            vim.cmd.close()
+            vim.api.nvim_create_autocmd("User", {
+                pattern = "AlphaReady",
+                callback = function()
+                    require("lazy").show()
+                end,
+            })
+        end
+        require("alpha").setup(dashboard.opts)
+        vim.api.nvim_create_autocmd("User", {
+            pattern = "LazyVimStarted",
+            callback = function()
+                local v = vim.version()
+                local dev = ""
+                if v.prerelease == "dev" then
+                    dev = "-dev+" .. v.build
+                else
+                    dev = ""
+                end
+                local version = v.major .. "." .. v.minor .. "." .. v.patch .. dev
+                local stats = require("lazy").stats()
+                local plugins_count = stats.loaded .. "/" .. stats.count
+                local ms = math.floor(stats.startuptime + 0.5)
+                local time = vim.fn.strftime("%H:%M:%S")
+                local date = vim.fn.strftime("%d.%m.%Y")
+                local line1 = " " .. plugins_count .. " plugins loaded in " .. ms .. "ms"
+                local line2 = "󰃭 " .. date .. "  " .. time
+                local line3 = " " .. version
+
+                local line1_width = vim.fn.strdisplaywidth(line1)
+                local line2Padded = string.rep(" ", (line1_width - vim.fn.strdisplaywidth(line2)) / 2) .. line2
+                local line3Padded = string.rep(" ", (line1_width - vim.fn.strdisplaywidth(line3)) / 2) .. line3
+
+                dashboard.section.footer.val = {
+                    line1,
+                    line2Padded,
+                    line3Padded,
+                }
+                pcall(vim.cmd.AlphaRedraw)
+            end,
+        })
+    end,
+}
diff --git a/lua/plugins/barbar.lua b/lua/plugins/barbar.lua
index 598eba3..7737d97 100644
--- a/lua/plugins/barbar.lua
+++ b/lua/plugins/barbar.lua
@@ -1,3 +1,10 @@
 return {
-	"romgrk/barbar.nvim",
+    'romgrk/barbar.nvim',
+    dependencies = {
+        'nvim-tree/nvim-web-devicons',
+        'lewis6991/gitsigns.nvim',
+    },
+    config = function()
+        require('barbar').setup()
+    end,
 }
diff --git a/lua/plugins/codeium.lua b/lua/plugins/codeium.lua
index 6ebd18b..0a490b9 100644
--- a/lua/plugins/codeium.lua
+++ b/lua/plugins/codeium.lua
@@ -1,6 +1,6 @@
 return {
     'Exafunction/codeium.vim',
-    event = 'BufEnter',
+    event = 'InsertEnter',
     cmd = 'Codeium',
     build = 'Codeium Auth:',
     dependencies = {
diff --git a/lua/plugins/colorschemes.lua b/lua/plugins/colorschemes.lua
index 23bfb0c..93ea128 100644
--- a/lua/plugins/colorschemes.lua
+++ b/lua/plugins/colorschemes.lua
@@ -1,6 +1,6 @@
 return {
 	'navarasu/onedark.nvim',
-
+    lazy = false,
 	config = function()
 		require('onedark').setup({
 			style = 'deep',
diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 094d769..d2af186 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -7,11 +7,12 @@ return {
 
         dependencies = {
             'saadparwaiz1/cmp_luasnip',
+            'hrsh7th/cmp-cmdline',
             'L3MON4D3/LuaSnip',
             'rafamadriz/friendly-snippets',
             'onsails/lspkind.nvim',
         },
-
+        event = 'InsertEnter',
         config = function()
             local cmp = require('cmp')
             local lspkind = require('lspkind')
@@ -58,6 +59,23 @@ return {
                     }),
                 },
             })
+            cmp.setup.cmdline({ '/', '?' }, {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = {
+                    { name = 'buffer' },
+                },
+            })
+
+            -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+            cmp.setup.cmdline(':', {
+                mapping = cmp.mapping.preset.cmdline(),
+                sources = cmp.config.sources({
+                    { name = 'path' },
+                }, {
+                    { name = 'cmdline' },
+                }),
+                matching = { disallow_symbol_nonprefix_matching = false },
+            })
         end,
     },
 }
diff --git a/lua/plugins/dashboard.lua b/lua/plugins/dashboard.lua
index 1059a66..054e1fe 100644
--- a/lua/plugins/dashboard.lua
+++ b/lua/plugins/dashboard.lua
@@ -1,10 +1,60 @@
 return {
     'nvimdev/dashboard-nvim',
+      dependencies = {
+        'nvim-tree/nvim-web-devicons',
+    },
     event = 'VimEnter',
     config = function()
         require('dashboard').setup({
-            -- config
+            theme = 'hyper',
+            disable_move = false,
+            shortcut_type = 'letter',
+            change_to_vcs_root = true,
+            hide = {
+                statusline = true,
+                tabline = false,
+                winbar = false,
+            },
+            config = {
+                header = {
+                    '',
+
+                    ' ███╗   ██╗███████╗ ██████╗ ██╗   ██╗██╗███╗   ███╗ ',
+                    ' ████╗  ██║██╔════╝██╔═══██╗██║   ██║██║████╗ ████║ ',
+                    ' ██╔██╗ ██║█████╗  ██║   ██║██║   ██║██║██╔████╔██║ ',
+                    ' ██║╚██╗██║██╔══╝  ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ',
+                    ' ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ',
+                    ' ╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝ ',
+                    '',
+                },
+                weak_header = {
+                    enable = false,
+                    append = { ' Learn, Make, Explore! ' },
+                },
+                packages = { enable = true },
+                project = { enable = true, limit = 8 },
+                mru = { limit = 8 },
+                shortcut ={
+                    {
+                        desc = '  Recent files',
+                        group = 'Label',
+                        action = 'Telescope oldfiles',
+                        key = 'r',
+                    },
+                    {
+                        desc = '  Find file',
+                        group = 'Label',
+                        action = 'Telescope find_files',
+                        key = 'f',
+                    },
+                    {
+                        desc = '  Find text',
+                        group = 'Label',
+                        action = 'Telescope live_grep',
+                        key = 't',
+                    },
+                },
+            },
         })
     end,
-    dependencies = { { 'nvim-tree/nvim-web-devicons' } },
 }
diff --git a/lua/plugins/dbee.lua b/lua/plugins/dbee.lua
new file mode 100644
index 0000000..ebda5f1
--- /dev/null
+++ b/lua/plugins/dbee.lua
@@ -0,0 +1,32 @@
+return {
+    'kndndrj/nvim-dbee',
+    dependencies = {
+        'MunifTanjim/nui.nvim',
+    },
+    build = function()
+        --    "curl", "wget", "bitsadmin", "go"
+        require('dbee').install(curl)
+    end,
+    cmd = 'DBToggle',
+    enabled = false,
+
+    config = function()
+        require('dbee').setup({
+            sources = {
+                require('dbee.sources').EnvSource:new('NVIM_DB'),
+                -- require("dbee.sources").MemorySource:new({
+                --     {
+                --         name = "dbname",
+                --         type = "postgres",
+                --         url = "postgres://pguser:pguser@localhost:5602/dbname?sslmode=disable"
+                --     },
+                -- }),
+                -- require("dbee.sources").FileSource:new(vim.fn.stdpath("cache") .. "/dbee/config.json"),
+            },
+        })
+
+        vim.api.nvim_create_user_command('DBToggle', function()
+            require('dbee').toggle()
+        end, {})
+    end,
+}
diff --git a/lua/plugins/dressing.lua b/lua/plugins/dressing.lua
new file mode 100644
index 0000000..eff1471
--- /dev/null
+++ b/lua/plugins/dressing.lua
@@ -0,0 +1,32 @@
+return {
+    'stevearc/dressing.nvim',
+    event = { 'BufReadPre', 'BufNewFile' },
+    config = function()
+        require('dressing').setup({
+            win_options = {
+                winblend = 10,
+                winhighlight =
+                'Normal:DressingInputNormalFloat,NormalFloat:DressingInputNormalFloat,FloatBorder:DressingInputFloatBorder',
+            },
+            input = {
+                enabled = true,
+                default_prompt = 'Input:',
+                prompt_align = 'left',
+                insert_only = true,
+                start_in_insert = true,
+                border = 'rounded',
+                relative = 'cursor',
+                prefer_width = 40,
+                width = nil,
+                max_width = { 140, 0.9 },
+                min_width = { 20, 0.2 },
+                get_config = nil,
+            },
+            select = {
+                enabled = true,
+                backend = { 'telescope', 'fzf_lua', 'fzf', 'nui', 'builtin' },
+                trim_prompt = true,
+            },
+        })
+    end,
+}
diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua
deleted file mode 100644
index e8e10be..0000000
--- a/lua/plugins/harpoon.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-    {
-        'ThePrimeagen/harpoon',
-        lazy = true,
-    },
-}
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index 93b55b8..eac5a41 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -1,17 +1,52 @@
 return {
     {
         'williamboman/mason.nvim',
-
+        cmd = 'Mason',
+        dependencies = {
+            'williamboman/mason-lspconfig.nvim',
+            'WhoIsSethDaniel/mason-tool-installer.nvim',
+        },
         config = function()
             require('mason').setup()
+            require('mason-lspconfig').setup({
+                ensure_installed = {
+                    'lua_ls',
+                    'clangd',
+                    'pylsp',
+                    'bashls',
+                    'jsonls',
+                    'vimls',
+                    'jdtls',
+                    'html',
+                    'cssls',
+                    'tailwindcss',
+                    'tsserver',
+                },
+            })
+
+            require('mason-tool-installer').setup({
+                ensure_installed = {
+                    'prettier',
+                    'stylua',
+                    'clang-format',
+                    'black',
+                    'gdformat',
+                    'djhtml',
+                },
+            })
         end,
     },
 
     {
         'neovim/nvim-lspconfig',
+        event = { 'BufReadPre', 'BufNewFile' },
 
         config = function()
             local lspconfig = require('lspconfig')
+            local handlers = {
+                ['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover, { border = 'rounded' }),
+                ['textDocument/signatureHelp'] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = 'rounded' }),
+            }
             local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
             lspconfig.lua_ls.setup({
@@ -37,7 +72,7 @@ return {
                 capabilities = capabilities,
                 handlers = handlers,
             })
-             lspconfig.biome.setup({
+            lspconfig.tsserver.setup({
                 capabilities = capabilities,
                 handlers = handlers,
             })
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index ad65e37..fcf8a75 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -1,7 +1,46 @@
 return {
-	'nvim-lualine/lualine.nvim',
-
-	config = function()
-		require('lualine').setup()
-	end,
+    'nvim-lualine/lualine.nvim',
+    event = { 'BufReadPre', 'BufNewFile' },
+    config = function()
+        require('lualine').setup({
+            options = {
+                icons_enabled = true,
+                theme = 'auto',
+                component_separators = { left = '', right = '' },
+                section_separators = { left = '', right = '' },
+                disabled_filetypes = {
+                    statusline = {},
+                    winbar = {},
+                },
+                ignore_focus = {},
+                always_divide_middle = true,
+                globalstatus = false,
+                refresh = {
+                    statusline = 1000,
+                    tabline = 1000,
+                    winbar = 1000,
+                },
+            },
+            sections = {
+                lualine_a = { 'mode' },
+                lualine_b = { 'branch', 'diff', 'diagnostics' },
+                lualine_c = { 'filename' },
+                lualine_x = { 'encoding', 'fileformat', 'filetype' },
+                lualine_y = { 'progress' },
+                lualine_z = { 'location' },
+            },
+            inactive_sections = {
+                lualine_a = {},
+                lualine_b = {},
+                lualine_c = { 'filename' },
+                lualine_x = { 'location' },
+                lualine_y = {},
+                lualine_z = {},
+            },
+            tabline = {},
+            winbar = {},
+            inactive_winbar = {},
+            extensions = {},
+        })
+    end,
 }
diff --git a/lua/plugins/markdown.lua b/lua/plugins/markdown.lua
deleted file mode 100644
index 98cd7ab..0000000
--- a/lua/plugins/markdown.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-	"iamcco/markdown-preview.nvim",
-	ft = "markdown",
-	build = function()
-		vim.fn["mkdp#util#install"]()
-	end,
-	cmd = {
-		"MarkdownPreviewToggle",
-		"MarkdownPreview",
-		"MarkdownPreviewStop",
-	},
-}
diff --git a/lua/plugins/navigator.lua b/lua/plugins/navigator.lua
new file mode 100644
index 0000000..3404937
--- /dev/null
+++ b/lua/plugins/navigator.lua
@@ -0,0 +1,6 @@
+return {
+    'numToStr/Navigator.nvim',
+    config = function()
+        require('Navigator').setup()
+    end,
+}
diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua
index f17fb80..a5396e2 100644
--- a/lua/plugins/none-ls.lua
+++ b/lua/plugins/none-ls.lua
@@ -1,6 +1,6 @@
 return {
 	'nvimtools/none-ls.nvim',
-
+    event = { 'BufReadPre', 'BufNewFile' },
 	config = function()
 		local null_ls = require('null-ls')
 
@@ -12,7 +12,6 @@ return {
 				null_ls.builtins.formatting.black,
 				null_ls.builtins.formatting.gdformat,
                 null_ls.builtins.formatting.djhtml,
-                null_ls.builtins.formatting.biome,
 			},
 		})
 	end,
diff --git a/lua/plugins/notify.lua b/lua/plugins/notify.lua
index e19eb04..d7b98ee 100644
--- a/lua/plugins/notify.lua
+++ b/lua/plugins/notify.lua
@@ -1,6 +1,6 @@
 return {
 	'rcarriga/nvim-notify',
-
+    event = 'VeryLazy',
 	config = function()
 		vim.notify = require('notify')
 
diff --git a/lua/plugins/nvim-surround.lua b/lua/plugins/nvim-surround.lua
index d8014a7..29a6fa6 100644
--- a/lua/plugins/nvim-surround.lua
+++ b/lua/plugins/nvim-surround.lua
@@ -1,6 +1,6 @@
 return {
 	"kylechui/nvim-surround",
-
+    event = { 'BufReadPre', 'BufNewFile' },
 	config = function()
 		require("nvim-surround").setup()
 	end,
diff --git a/lua/plugins/nvim-treesitter.lua b/lua/plugins/nvim-treesitter.lua
index 75601ba..6238aad 100644
--- a/lua/plugins/nvim-treesitter.lua
+++ b/lua/plugins/nvim-treesitter.lua
@@ -1,13 +1,16 @@
 return {
 	"nvim-treesitter/nvim-treesitter",
 	build = ":TSUpdate",
-
+    dependencies = {
+        'windwp/nvim-ts-autotag',
+    },
+    event = { 'BufReadPre', 'BufNewFile' },
 	config = function()
 		local configs = require("nvim-treesitter.configs")
 
 		configs.setup({
-			ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "cpp", "html", "css", "javascript", "typescript", "json", "php" },
-			sync_install = false,
+			ensure_installed = { "c", "lua", "vim", "vimdoc", "python", "cpp", "html", "css", "javascript", "typescript", "json", "php", "gdscript", 'markdown', 'markdown_inline', 'bash','java' },
+			sync_install = true,
 			highlight = { enable = true },
 			indent = { enable = true },
 		})
diff --git a/lua/plugins/refactoring.lua b/lua/plugins/refactoring.lua
new file mode 100644
index 0000000..e46a8d6
--- /dev/null
+++ b/lua/plugins/refactoring.lua
@@ -0,0 +1,32 @@
+return {
+    'ThePrimeagen/refactoring.nvim',
+    dependencies = {
+        'nvim-lua/plenary.nvim',
+        'nvim-treesitter/nvim-treesitter',
+    },
+    config = function()
+        require('refactoring').setup({
+            prompt_func_return_type = {
+                go = false,
+                java = false,
+                cpp = false,
+                c = false,
+                h = false,
+                hpp = false,
+                cxx = false,
+            },
+            prompt_func_param_type = {
+                go = false,
+                java = false,
+
+                cpp = false,
+                c = false,
+                h = false,
+                hpp = false,
+                cxx = false,
+            },
+            printf_statements = {},
+            print_var_statements = {},
+        })
+    end,
+}
diff --git a/lua/plugins/terminal.lua b/lua/plugins/terminal.lua
new file mode 100644
index 0000000..9c72417
--- /dev/null
+++ b/lua/plugins/terminal.lua
@@ -0,0 +1,4 @@
+return {
+    '2kabhishek/termim.nvim',
+    cmd = { 'Fterm', 'FTerm', 'Sterm', 'STerm', 'Vterm', 'VTerm' },
+}
diff --git a/lua/plugins/toggle-term.lua b/lua/plugins/toggle-term.lua
deleted file mode 100644
index 3714f51..0000000
--- a/lua/plugins/toggle-term.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-	"akinsho/toggleterm.nvim",
-
-	config = function ()
-		require("toggleterm").setup({
-			shade_terminals = false,
-		})
-	end
-}