diff --git a/init.lua b/init.lua
index 10f915a..920e6fa 100644
--- a/init.lua
+++ b/init.lua
@@ -35,7 +35,8 @@ vim.cmd([[autocmd VimEnter * highlight Function gui=italic guifg=orange]])
 vim.cmd([[autocmd VimEnter * highlight StatusLine gui=italic guibg=NONE]])
 vim.cmd([[autocmd VimEnter * highlight StatusLineNC gui=italic guibg=NONE]])
 vim.cmd([[autocmd VimEnter * highlight NvimTreeIndentMarker guifg=#61afef]])
-vim.cmd([[autocmd VimEnter * filetype plugin indent on]])
-vim.cmd([[autocmd VimEnter * syntax on]])
-vim.cmd([[autocmd BufRead,BufNewFile *.qml	setfiletype qmljs]])
+vim.cmd([[autocmd BufReadPost,BufNewFile * filetype plugin indent on]])
+vim.cmd([[autocmd BufReadPost,BufNewFile * syntax on]])
+vim.cmd([[autocmd BufReadPost,BufNewFile * lua require("codewindow").toggle_minimap()]])
+vim.cmd([[autocmd BufReadPost,BufNewFile *.qml	setfiletype qmljs]])
 vim.cmd([[autocmd BufWritePost ~/.local/share/chezmoi/* ! chezmoi apply --source-path "%"]])
diff --git a/lua/NeutronVim/plugins/Coding/surround.lua b/lua/NeutronVim/plugins/Coding/surround.lua
index 6748666..ca65605 100644
--- a/lua/NeutronVim/plugins/Coding/surround.lua
+++ b/lua/NeutronVim/plugins/Coding/surround.lua
@@ -1,6 +1,6 @@
 return {
   "echasnovski/mini.surround",
-  event = { "BufReadPost", "BufNewFile" },
+  event = { "BufReadPre", "BufNewFile" },
   lazy = true,
   version = "*",
   config = function()
@@ -16,7 +16,6 @@ return {
         find_left = "gsF", -- Find surrounding (to the left)
         highlight = "gsh", -- Highlight surrounding
         replace = "gsr", -- Replace surrounding
-        update_n_lines = "gsn", -- Update `n_lines`
       },
     })
   end,
diff --git a/lua/NeutronVim/plugins/Editor/nvim-tree.lua b/lua/NeutronVim/plugins/Editor/nvim-tree.lua
index afb6e33..2168458 100644
--- a/lua/NeutronVim/plugins/Editor/nvim-tree.lua
+++ b/lua/NeutronVim/plugins/Editor/nvim-tree.lua
@@ -6,6 +6,7 @@ return {
     keys = {
       { "<C-n>", "<cmd>NvimTreeFindFileToggle<cr>", desc = "NvimTree" },
     },
+    event = "VimEnter",
     config = function()
       local nvimtree_status_ok, nvimtree = pcall(require, "nvim-tree")
       if not nvimtree_status_ok then
diff --git a/lua/NeutronVim/plugins/Editor/telescope.lua b/lua/NeutronVim/plugins/Editor/telescope.lua
index bfdfebf..3d25299 100644
--- a/lua/NeutronVim/plugins/Editor/telescope.lua
+++ b/lua/NeutronVim/plugins/Editor/telescope.lua
@@ -2,7 +2,7 @@ return {
   {
     "nvim-telescope/telescope.nvim",
     cmd = "Telescope",
-    lazy = true,
+    event = "BufEnter",
     keys = {
       { "ff", "<cmd>Telescope find_files<CR>", desc = "Find Files Fuzzily" },
       { "fg", "<cmd>Telescope live_grep<CR>", desc = "Find Text" },
diff --git a/lua/NeutronVim/plugins/Git-Integration/git.lua b/lua/NeutronVim/plugins/Git-Integration/git.lua
index c826792..28d8ad4 100644
--- a/lua/NeutronVim/plugins/Git-Integration/git.lua
+++ b/lua/NeutronVim/plugins/Git-Integration/git.lua
@@ -1,6 +1,6 @@
 return {
   "lewis6991/gitsigns.nvim",
-  event = "BufRead",
+  event = { "BufReadPost", "BufWritePost", "BufNewFile" },
   keys = {
     { ";j", "<cmd>lua require('gitsigns').next_hunk()<CR>", desc = "Next Hunk" },
     { ";k", "<cmd>lua require('gitsigns').prev_hunk()<CR>", desc = "Prev Hunk" },
diff --git a/lua/NeutronVim/plugins/UI/barbecue.lua b/lua/NeutronVim/plugins/LSP/barbecue.lua
similarity index 99%
rename from lua/NeutronVim/plugins/UI/barbecue.lua
rename to lua/NeutronVim/plugins/LSP/barbecue.lua
index 8bd1f4c..1b69bea 100644
--- a/lua/NeutronVim/plugins/UI/barbecue.lua
+++ b/lua/NeutronVim/plugins/LSP/barbecue.lua
@@ -37,5 +37,5 @@ return {
         require("barbecue.ui").update()
       end,
     })
-  end
+  end,
 }
diff --git a/lua/NeutronVim/plugins/LSP/codeaction.lua b/lua/NeutronVim/plugins/LSP/codeaction.lua
index 9f4ac2e..bc3dff0 100644
--- a/lua/NeutronVim/plugins/LSP/codeaction.lua
+++ b/lua/NeutronVim/plugins/LSP/codeaction.lua
@@ -5,6 +5,7 @@ return {
       { "\\a", "<cmd>lua require('actions-preview').code_actions()<CR>", desc = "CodeActionMenu" },
     },
     lazy = true,
+    event = "LspAttach",
     config = function()
       require("actions-preview").setup({
         telescope = {
diff --git a/lua/NeutronVim/plugins/LSP/mason.lua b/lua/NeutronVim/plugins/LSP/mason.lua
index 35e4b6e..0d90dce 100644
--- a/lua/NeutronVim/plugins/LSP/mason.lua
+++ b/lua/NeutronVim/plugins/LSP/mason.lua
@@ -1,6 +1,6 @@
 return {
   "williamboman/mason.nvim",
-  event = { "BufReadPost", "BufNewFile" },
+  event = { "BufReadPre", "BufNewFile" },
   lazy = true,
   dependencies = {
     { "williamboman/mason-lspconfig.nvim", cmd = { "LspInstall", "LspUninstall" } },
diff --git a/lua/NeutronVim/plugins/LSP/none-ls.lua b/lua/NeutronVim/plugins/LSP/none-ls.lua
index 6b6b5f9..a92628a 100644
--- a/lua/NeutronVim/plugins/LSP/none-ls.lua
+++ b/lua/NeutronVim/plugins/LSP/none-ls.lua
@@ -3,7 +3,7 @@ return {
   dependencies = {
     "jay-babu/mason-null-ls.nvim",
   },
-  event = { "BufReadPre", "BufNewFile" },
+  event = "VimEnter",
   lazy = true,
   config = function()
     local none_ls_status_ok, none_ls = pcall(require, "null-ls")
diff --git a/lua/NeutronVim/plugins/UI/noice.lua b/lua/NeutronVim/plugins/UI/noice.lua
index 9bc63b6..9a5b388 100644
--- a/lua/NeutronVim/plugins/UI/noice.lua
+++ b/lua/NeutronVim/plugins/UI/noice.lua
@@ -1,6 +1,6 @@
 return {
   "folke/noice.nvim",
-  event = "VeryLazy",
+  event = "VimEnter",
   lazy = true,
   opts = {
     lsp = {
diff --git a/lua/NeutronVim/plugins/Utils/codewindow.lua b/lua/NeutronVim/plugins/Utils/codewindow.lua
new file mode 100644
index 0000000..a04dc0b
--- /dev/null
+++ b/lua/NeutronVim/plugins/Utils/codewindow.lua
@@ -0,0 +1,13 @@
+return {
+  "gorbit99/codewindow.nvim",
+  config = function()
+    local codewindow_status_ok, codewindow = pcall(require, "codewindow")
+    if not codewindow_status_ok then
+      print("codewindow not found!")
+    end
+    codewindow.setup({
+      auto_enable = true,
+      width_multiplier = 5,
+    })
+  end,
+}
diff --git a/lua/NeutronVim/plugins/Utils/minimap.lua b/lua/NeutronVim/plugins/Utils/minimap.lua
deleted file mode 100644
index d1b1a38..0000000
--- a/lua/NeutronVim/plugins/Utils/minimap.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  "wfxr/minimap.vim",
-  lazy = true,
-  cmd = { "Minimap", "MinimapClose", "MinimapToggle", "MinimapRefresh" },
-  config = function()
-    vim.cmd([[let g:minimap_width = 20
-              let g:minimap_auto_start = 1
-              let g:minimap_highlight_search = 1
-              let g:minimap_auto_start_win_enter = 1]])
-  end,
-}
diff --git a/lua/NeutronVim/plugins/Utils/treesitter.lua b/lua/NeutronVim/plugins/Utils/treesitter.lua
index 40d8586..a97cc63 100644
--- a/lua/NeutronVim/plugins/Utils/treesitter.lua
+++ b/lua/NeutronVim/plugins/Utils/treesitter.lua
@@ -3,7 +3,7 @@ return {
     "nvim-treesitter/nvim-treesitter",
     build = ":TSUpdate",
     lazy = true,
-    event = { "BufReadPost", "BufNewFile" },
+    event = { "BufEnter" },
     version = false,
     cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" },
     config = function()
@@ -14,21 +14,31 @@ return {
       ---@diagnostic disable-next-line: missing-fields
       treesitter.setup({
         ensure_installed = {
-          "vimdoc",
-          "javascript",
+          "bash",
           "c",
+          "css",
+          "diff",
+          "html",
+          "hyprlang",
+          "javascript",
+          "jsdoc",
+          "json",
+          "jsonc",
           "lua",
+          "luadoc",
+          "luap",
+          "markdown",
+          "markdown_inline",
           "python",
           "query",
-          "json",
-          "vim",
           "regex",
-          "markdown_inline",
-          "bash",
           "toml",
-          "html",
           "rust",
-          "css",
+          "tsx",
+          "typescript",
+          "vim",
+          "vimdoc",
+          "yaml",
         },
         sync_install = false,
         auto_install = true,
@@ -49,12 +59,15 @@ return {
           },
         },
       })
+      vim.filetype.add({
+        pattern = { [".*/hyprland%.conf"] = "hyprlang" },
+      })
     end,
   },
   {
     "nvim-treesitter/playground",
     keys = {
-      { "<leader>ml", "<cmd>TSPlaygroundToggle<CR>", desc = "Toggle Playground" },
+      { "<leader>mp", "<cmd>TSPlaygroundToggle<CR>", desc = "Toggle Playground" },
     },
     cmd = "TSPlaygroundToggle",
     lazy = true,
@@ -126,18 +139,4 @@ return {
       })
     end,
   },
-  {
-    "luckasRanarison/tree-sitter-hypr",
-    event = "BufRead */hypr/*.conf",
-    config = function()
-      require("nvim-treesitter.parsers").get_parser_configs().hypr = {
-        install_info = {
-          url = "https://github.com/luckasRanarison/tree-sitter-hypr",
-          files = { "src/parser.c" },
-          branch = "master",
-        },
-        filetype = "hypr",
-      }
-    end,
-  },
 }