diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 38eb495..e5f7618 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1,4 +1,4 @@
 vim.loader.enable()
 require "config.options"
-require "config.lazy"
 require "config.keymaps"
+require "config.lazy"
diff --git a/nvim/.config/nvim/lua/config/lazy.lua b/nvim/.config/nvim/lua/config/lazy.lua
index b22e5da..9edcc57 100644
--- a/nvim/.config/nvim/lua/config/lazy.lua
+++ b/nvim/.config/nvim/lua/config/lazy.lua
@@ -19,6 +19,11 @@ vim.opt.rtp:prepend(lazypath)
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
+-- Add support for the LazyFile event
+local Event = require "lazy.core.handler.event"
+Event.mappings.LazyFile = { id = "LazyFile", event = { "BufReadPost", "BufNewFile", "BufWritePre" } }
+Event.mappings["User LazyFile"] = Event.mappings.LazyFile
+
 -- Setup lazy.nvim
 require("lazy").setup {
   spec = {
diff --git a/nvim/.config/nvim/lua/plugins/auto-tags.lua b/nvim/.config/nvim/lua/plugins/auto-tags.lua
index d910abb..9c49e62 100644
--- a/nvim/.config/nvim/lua/plugins/auto-tags.lua
+++ b/nvim/.config/nvim/lua/plugins/auto-tags.lua
@@ -1,5 +1,5 @@
 return {
-  -- This is nice because it also autorenames html tags
+  -- Use treesitter to autoclose and autorename html tag
   "windwp/nvim-ts-autotag",
   event = "InsertEnter",
   opts = {},
diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua
index 0b1750a..812311b 100644
--- a/nvim/.config/nvim/lua/plugins/blink.lua
+++ b/nvim/.config/nvim/lua/plugins/blink.lua
@@ -1,6 +1,6 @@
 return {
   "saghen/blink.cmp",
-  event = "VimEnter",
+  event = "InsertEnter",
   version = "1.*",
   dependencies = {
     "rafamadriz/friendly-snippets",
diff --git a/nvim/.config/nvim/lua/plugins/colorizer.lua b/nvim/.config/nvim/lua/plugins/colorizer.lua
index 762a378..361b6df 100644
--- a/nvim/.config/nvim/lua/plugins/colorizer.lua
+++ b/nvim/.config/nvim/lua/plugins/colorizer.lua
@@ -1,6 +1,6 @@
 return {
   "catgoose/nvim-colorizer.lua",
-  event = "BufReadPre",
+  event = "LazyFile",
   opts = {
     tailwind = true,
     tailwind_opts = {
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua
index 3c6efa6..255cb79 100644
--- a/nvim/.config/nvim/lua/plugins/conform.lua
+++ b/nvim/.config/nvim/lua/plugins/conform.lua
@@ -1,6 +1,6 @@
 return {
   "stevearc/conform.nvim",
-  event = { "BufWritePre" },
+  event = "LazyFile",
   opts = {
     notify_on_error = true,
     format_on_save = {
diff --git a/nvim/.config/nvim/lua/plugins/gitsings.lua b/nvim/.config/nvim/lua/plugins/gitsings.lua
index 3905c1b..0706dec 100644
--- a/nvim/.config/nvim/lua/plugins/gitsings.lua
+++ b/nvim/.config/nvim/lua/plugins/gitsings.lua
@@ -1,5 +1,6 @@
 return {
   "lewis6991/gitsigns.nvim",
+  event = "LazyFile",
   opts = {
     signs = {
       add = { text = "+" },
diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua
index a4eb7b0..40e13c9 100644
--- a/nvim/.config/nvim/lua/plugins/lsp.lua
+++ b/nvim/.config/nvim/lua/plugins/lsp.lua
@@ -1,6 +1,6 @@
 return {
   "neovim/nvim-lspconfig",
-  event = { "BufReadPre", "BufNewFile" },
+  event = "LazyFile",
   dependencies = {
     { "mason-org/mason.nvim", cmd = "Mason", opts = {} },
     -- Blink-based completion (no manual capabilities merge needed)
diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/nvim/.config/nvim/lua/plugins/oil.lua
index 63d70f2..ec75456 100644
--- a/nvim/.config/nvim/lua/plugins/oil.lua
+++ b/nvim/.config/nvim/lua/plugins/oil.lua
@@ -2,6 +2,7 @@ return {
   {
     "stevearc/oil.nvim",
     dependencies = { "nvim-tree/nvim-web-devicons" },
+    lazy = false,
     opts = {
       view_options = {
         show_hidden = true,
diff --git a/nvim/.config/nvim/lua/plugins/tmux-navigator.lua b/nvim/.config/nvim/lua/plugins/tmux-navigator.lua
index f3cd92b..e99e8d3 100644
--- a/nvim/.config/nvim/lua/plugins/tmux-navigator.lua
+++ b/nvim/.config/nvim/lua/plugins/tmux-navigator.lua
@@ -1,13 +1,5 @@
 return {
   "christoomey/vim-tmux-navigator",
-  event = "VeryLazy",
-  cmd = {
-    "TmuxNavigateLeft",
-    "TmuxNavigateDown",
-    "TmuxNavigateUp",
-    "TmuxNavigateRight",
-    "TmuxNavigatePrevious",
-  },
   keys = {
     { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
     { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua
index c38c19f..1157013 100644
--- a/nvim/.config/nvim/lua/plugins/treesitter.lua
+++ b/nvim/.config/nvim/lua/plugins/treesitter.lua
@@ -3,6 +3,7 @@ return {
   dependencies = {
     "nvim-treesitter/nvim-treesitter-textobjects",
   },
+  event = "LazyFile",
   build = ":TSUpdate",
   main = "nvim-treesitter.configs",
   opts = {