From 28a46771e43a2d763619764a44e692c0fd0eb47f Mon Sep 17 00:00:00 2001
From: redjax <5534031+redjax@users.noreply.github.com>
Date: Mon, 22 Sep 2025 11:55:24 -0400
Subject: [PATCH 1/6] fix(themery): Set themery to lazily load

---
 config/nvim-work/lua/plugins/lazy/themery.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/nvim-work/lua/plugins/lazy/themery.lua b/config/nvim-work/lua/plugins/lazy/themery.lua
index f960b4e1..ebabd20b 100644
--- a/config/nvim-work/lua/plugins/lazy/themery.lua
+++ b/config/nvim-work/lua/plugins/lazy/themery.lua
@@ -36,6 +36,9 @@ local theme_menu_items = {
 
 return {
     "zaldih/themery.nvim",
+    lazy = false,  -- Load immediately so it's always available
+    priority = 1000,  -- Load early
+    cmd = "Themery",  -- Also load on command
     config = function()
         require("themery").setup({
             themes = theme_menu_items,

From 7794300add9678646be14e6898f0323441a92bfa Mon Sep 17 00:00:00 2001
From: redjax <5534031+redjax@users.noreply.github.com>
Date: Mon, 22 Sep 2025 11:59:19 -0400
Subject: [PATCH 2/6] fix(themes): Fix themes loading

---
 config/nvim-work/lua/plugins/lazy/themery.lua | 2 +-
 config/nvim-work/lua/themes/eldritch.lua      | 2 +-
 config/nvim-work/lua/themes/kanagawa.lua      | 2 +-
 config/nvim-work/lua/themes/neko-knight.lua   | 2 +-
 config/nvim-work/lua/themes/one_monokai.lua   | 2 +-
 config/nvim-work/lua/themes/oxocarbon.lua     | 2 +-
 config/nvim-work/lua/themes/poimandres.lua    | 6 +++++-
 config/nvim-work/lua/themes/vscode-modern.lua | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/config/nvim-work/lua/plugins/lazy/themery.lua b/config/nvim-work/lua/plugins/lazy/themery.lua
index ebabd20b..82fb6011 100644
--- a/config/nvim-work/lua/plugins/lazy/themery.lua
+++ b/config/nvim-work/lua/plugins/lazy/themery.lua
@@ -37,7 +37,7 @@ local theme_menu_items = {
 return {
     "zaldih/themery.nvim",
     lazy = false,  -- Load immediately so it's always available
-    priority = 1000,  -- Load early
+    priority = 1001,  -- Higher priority than themes (1000) to load first
     cmd = "Themery",  -- Also load on command
     config = function()
         require("themery").setup({
diff --git a/config/nvim-work/lua/themes/eldritch.lua b/config/nvim-work/lua/themes/eldritch.lua
index b6474b73..9b9dc959 100644
--- a/config/nvim-work/lua/themes/eldritch.lua
+++ b/config/nvim-work/lua/themes/eldritch.lua
@@ -3,7 +3,7 @@
 return {
   "eldritch-theme/eldritch.nvim",
   name = "eldritch",
-  lazy = false,
+  lazy = true,  -- Let Themery manage loading
   priority = 1000,
   opts = {},
   config = function()
diff --git a/config/nvim-work/lua/themes/kanagawa.lua b/config/nvim-work/lua/themes/kanagawa.lua
index 899f0023..01547e27 100644
--- a/config/nvim-work/lua/themes/kanagawa.lua
+++ b/config/nvim-work/lua/themes/kanagawa.lua
@@ -3,7 +3,7 @@
 return {
     "rebelot/kanagawa.nvim",
     name = "kanagawa",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     config = function()
         require('kanagawa').setup({
diff --git a/config/nvim-work/lua/themes/neko-knight.lua b/config/nvim-work/lua/themes/neko-knight.lua
index 1b53fed2..d6f9251d 100644
--- a/config/nvim-work/lua/themes/neko-knight.lua
+++ b/config/nvim-work/lua/themes/neko-knight.lua
@@ -3,7 +3,7 @@
 return {
   "neko-night/nvim",
   priority = 1000,
-  lazy = false,
+  lazy = true,  -- Let Themery manage loading
   config = function()
   end,
 }
diff --git a/config/nvim-work/lua/themes/one_monokai.lua b/config/nvim-work/lua/themes/one_monokai.lua
index f1b99664..65d6ce22 100644
--- a/config/nvim-work/lua/themes/one_monokai.lua
+++ b/config/nvim-work/lua/themes/one_monokai.lua
@@ -3,7 +3,7 @@
 return {
     "cpea2506/one_monokai.nvim",
     name = "one_monokai",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     opts = {},
     config = function()
diff --git a/config/nvim-work/lua/themes/oxocarbon.lua b/config/nvim-work/lua/themes/oxocarbon.lua
index 5095122c..56d0f3c7 100644
--- a/config/nvim-work/lua/themes/oxocarbon.lua
+++ b/config/nvim-work/lua/themes/oxocarbon.lua
@@ -3,6 +3,6 @@
 return {
     "nyoom-engineering/oxocarbon.nvim",
     name = "oxocarbon",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim-work/lua/themes/poimandres.lua b/config/nvim-work/lua/themes/poimandres.lua
index 5a136837..b2eb2068 100644
--- a/config/nvim-work/lua/themes/poimandres.lua
+++ b/config/nvim-work/lua/themes/poimandres.lua
@@ -1,4 +1,8 @@
--- Poimandres theme https://github.com/olivercederborg/poimandres.nvim
+--return {
+  "olivercederborg/poimandres.nvim",
+  name = "poimandres",
+  lazy = true,  -- Let Themery manage loading
+  priority = 1000,andres theme https://github.com/olivercederborg/poimandres.nvim
 
 return { 
   'olivercederborg/poimandres.nvim',
diff --git a/config/nvim-work/lua/themes/vscode-modern.lua b/config/nvim-work/lua/themes/vscode-modern.lua
index f3845234..dc909b8e 100644
--- a/config/nvim-work/lua/themes/vscode-modern.lua
+++ b/config/nvim-work/lua/themes/vscode-modern.lua
@@ -3,7 +3,7 @@
 return {
     "gmr458/vscode_modern_theme.nvim",
     name = "vscode_modern",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     config = function()
         require("vscode_modern").setup({

From e2b3ef9a9f67f454f545306b9078b204be14c7d0 Mon Sep 17 00:00:00 2001
From: redjax <5534031+redjax@users.noreply.github.com>
Date: Mon, 22 Sep 2025 12:00:18 -0400
Subject: [PATCH 3/6] fix(neorg): Fix neorg lazy loading

---
 config/nvim-work/lua/plugins/lazy/neorg.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/nvim-work/lua/plugins/lazy/neorg.lua b/config/nvim-work/lua/plugins/lazy/neorg.lua
index 941c9119..3308ca1b 100644
--- a/config/nvim-work/lua/plugins/lazy/neorg.lua
+++ b/config/nvim-work/lua/plugins/lazy/neorg.lua
@@ -8,6 +8,8 @@ return {
   },
   {
     "nvim-neorg/neorg",
+    lazy = false,  -- Load immediately to ensure keybindings are available
+    priority = 1000,  -- High priority loading
     dependencies = {
       "luarocks.nvim",
       "nvim-telescope/telescope.nvim",          -- keep if you later re-enable integrations

From 4ffb54035fd51f2f6612b9276ef0619a56f76bb1 Mon Sep 17 00:00:00 2001
From: redjax <5534031+redjax@users.noreply.github.com>
Date: Mon, 22 Sep 2025 12:01:01 -0400
Subject: [PATCH 4/6] fix(theme): Fix poimandres theme

---
 config/nvim-work/lua/themes/poimandres.lua | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/config/nvim-work/lua/themes/poimandres.lua b/config/nvim-work/lua/themes/poimandres.lua
index b2eb2068..92f65ad3 100644
--- a/config/nvim-work/lua/themes/poimandres.lua
+++ b/config/nvim-work/lua/themes/poimandres.lua
@@ -1,13 +1,9 @@
---return {
+-- Poimandres theme https://github.com/olivercederborg/poimandres.nvim
+
+return {
   "olivercederborg/poimandres.nvim",
   name = "poimandres",
   lazy = true,  -- Let Themery manage loading
-  priority = 1000,andres theme https://github.com/olivercederborg/poimandres.nvim
-
-return { 
-  'olivercederborg/poimandres.nvim',
-  name = "poimandres",
-  lazy = false,
   priority = 1000,
   config = function()
     require('poimandres').setup {

From 8f6e5b0ad8196e009b10ef3418e112c765485504 Mon Sep 17 00:00:00 2001
From: redjax <5534031+redjax@users.noreply.github.com>
Date: Mon, 22 Sep 2025 12:04:40 -0400
Subject: [PATCH 5/6] fix(themes): Fix themes loading in main nvim profile

---
 config/nvim/lua/plugins/lazy/packages/themery.lua | 3 +++
 config/nvim/lua/themes/aura.lua                   | 2 +-
 config/nvim/lua/themes/ayu.lua                    | 2 +-
 config/nvim/lua/themes/catppuccin.lua             | 2 +-
 config/nvim/lua/themes/disabled/everforest.lua    | 2 +-
 config/nvim/lua/themes/dracula.lua                | 2 +-
 config/nvim/lua/themes/edge.lua                   | 2 +-
 config/nvim/lua/themes/ef.lua                     | 2 +-
 config/nvim/lua/themes/eldritch.lua               | 2 +-
 config/nvim/lua/themes/horizon-extended.lua       | 2 +-
 config/nvim/lua/themes/kanagawa.lua               | 2 +-
 config/nvim/lua/themes/kurayami.lua               | 2 +-
 config/nvim/lua/themes/monokai.lua                | 2 +-
 config/nvim/lua/themes/neko-knight.lua            | 2 +-
 config/nvim/lua/themes/nightfly.lua               | 2 +-
 config/nvim/lua/themes/nordic.lua                 | 2 +-
 config/nvim/lua/themes/one_monokai.lua            | 2 +-
 config/nvim/lua/themes/onedark.lua                | 2 +-
 config/nvim/lua/themes/onedarkpro.lua             | 2 +-
 config/nvim/lua/themes/oxocarbon.lua              | 2 +-
 config/nvim/lua/themes/palenight-fall.lua         | 2 +-
 config/nvim/lua/themes/papercolor.lua             | 2 +-
 config/nvim/lua/themes/penumbra.lua               | 2 +-
 config/nvim/lua/themes/poimandres.lua             | 2 +-
 config/nvim/lua/themes/tokyonight.lua             | 2 +-
 config/nvim/lua/themes/vscode-modern.lua          | 2 +-
 config/nvim/lua/themes/zenburn.lua                | 2 +-
 config/nvim/lua/themes/zephyrium.lua              | 2 +-
 28 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/config/nvim/lua/plugins/lazy/packages/themery.lua b/config/nvim/lua/plugins/lazy/packages/themery.lua
index b779c0d3..17ed6b74 100644
--- a/config/nvim/lua/plugins/lazy/packages/themery.lua
+++ b/config/nvim/lua/plugins/lazy/packages/themery.lua
@@ -62,6 +62,9 @@ local theme_menu_items = {
 
 return {
     "zaldih/themery.nvim",
+    lazy = false,  -- Load immediately so it's always available
+    priority = 1001,  -- Higher priority than themes (1000) to load first
+    cmd = "Themery",  -- Also load on command
     config = function()
         require("themery").setup({
             themes = theme_menu_items,
diff --git a/config/nvim/lua/themes/aura.lua b/config/nvim/lua/themes/aura.lua
index 7e8e8c55..78474a37 100644
--- a/config/nvim/lua/themes/aura.lua
+++ b/config/nvim/lua/themes/aura.lua
@@ -3,7 +3,7 @@
 return {
     "daltonmenezes/aura-theme",
     name = "aura-theme",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     config = function(plugin)
       vim.opt.rtp:append(plugin.dir .. "/packages/neovim")
diff --git a/config/nvim/lua/themes/ayu.lua b/config/nvim/lua/themes/ayu.lua
index a4406867..3bc674a3 100644
--- a/config/nvim/lua/themes/ayu.lua
+++ b/config/nvim/lua/themes/ayu.lua
@@ -3,7 +3,7 @@
 return {
     "Shatur/neovim-ayu",
     name = "ayu",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     init = function()
         -- Options: ayu-dark, ayu-light, ayu-mirage
diff --git a/config/nvim/lua/themes/catppuccin.lua b/config/nvim/lua/themes/catppuccin.lua
index 4e342fa2..01c10a66 100644
--- a/config/nvim/lua/themes/catppuccin.lua
+++ b/config/nvim/lua/themes/catppuccin.lua
@@ -3,6 +3,6 @@
 return {
     "catppuccin/nvim",
     name = "catppuccin",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/disabled/everforest.lua b/config/nvim/lua/themes/disabled/everforest.lua
index 6ebc0b0d..cf6fc40d 100644
--- a/config/nvim/lua/themes/disabled/everforest.lua
+++ b/config/nvim/lua/themes/disabled/everforest.lua
@@ -3,6 +3,6 @@
 return {
     "sainnhe/everforest",
     name = "everforest",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/dracula.lua b/config/nvim/lua/themes/dracula.lua
index d571ba2c..166d2c19 100644
--- a/config/nvim/lua/themes/dracula.lua
+++ b/config/nvim/lua/themes/dracula.lua
@@ -3,6 +3,6 @@
 return {
     "Mofiqul/dracula.nvim",
     name = "dracula",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/edge.lua b/config/nvim/lua/themes/edge.lua
index 20c75a19..d6b23026 100644
--- a/config/nvim/lua/themes/edge.lua
+++ b/config/nvim/lua/themes/edge.lua
@@ -3,7 +3,7 @@
 return {
     "sainnhe/edge",
     name = "edge",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     init = function()
         -- Options: aura, neon, aura_dim, light
diff --git a/config/nvim/lua/themes/ef.lua b/config/nvim/lua/themes/ef.lua
index b8756b3d..052d7383 100644
--- a/config/nvim/lua/themes/ef.lua
+++ b/config/nvim/lua/themes/ef.lua
@@ -3,7 +3,7 @@
 return {
     "oonamo/ef-themes.nvim",
     name = "ef",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     config = function()
         require("ef-themes").setup({
diff --git a/config/nvim/lua/themes/eldritch.lua b/config/nvim/lua/themes/eldritch.lua
index b6474b73..9b9dc959 100644
--- a/config/nvim/lua/themes/eldritch.lua
+++ b/config/nvim/lua/themes/eldritch.lua
@@ -3,7 +3,7 @@
 return {
   "eldritch-theme/eldritch.nvim",
   name = "eldritch",
-  lazy = false,
+  lazy = true,  -- Let Themery manage loading
   priority = 1000,
   opts = {},
   config = function()
diff --git a/config/nvim/lua/themes/horizon-extended.lua b/config/nvim/lua/themes/horizon-extended.lua
index 0c25b3a7..6e4d9a7f 100644
--- a/config/nvim/lua/themes/horizon-extended.lua
+++ b/config/nvim/lua/themes/horizon-extended.lua
@@ -3,7 +3,7 @@
 return { 
     "lancewilhelm/horizon-extended.nvim",
     name = "horizon-extended",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     init = function()
         -- Options: 'neo', 'beam', 'ray'
diff --git a/config/nvim/lua/themes/kanagawa.lua b/config/nvim/lua/themes/kanagawa.lua
index 73f6bad7..b97f698f 100644
--- a/config/nvim/lua/themes/kanagawa.lua
+++ b/config/nvim/lua/themes/kanagawa.lua
@@ -3,7 +3,7 @@
 return {
     "rebelot/kanagawa.nvim",
     name = "kanagawa",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     config = function()
         require('kanagawa').setup({
diff --git a/config/nvim/lua/themes/kurayami.lua b/config/nvim/lua/themes/kurayami.lua
index 53689269..d943037d 100644
--- a/config/nvim/lua/themes/kurayami.lua
+++ b/config/nvim/lua/themes/kurayami.lua
@@ -3,7 +3,7 @@
 return {
    "kevinm6/kurayami.nvim",
    event = "VimEnter",
-   lazy = false,
+   lazy = true,  -- Let Themery manage loading
    priority = 1000,                  
    config = function()        
    end,
diff --git a/config/nvim/lua/themes/monokai.lua b/config/nvim/lua/themes/monokai.lua
index 0affbf15..93e0c354 100644
--- a/config/nvim/lua/themes/monokai.lua
+++ b/config/nvim/lua/themes/monokai.lua
@@ -3,6 +3,6 @@
 return {
     "tanvirtin/monokai.nvim",
     name = "monokai",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/neko-knight.lua b/config/nvim/lua/themes/neko-knight.lua
index 1b53fed2..d6f9251d 100644
--- a/config/nvim/lua/themes/neko-knight.lua
+++ b/config/nvim/lua/themes/neko-knight.lua
@@ -3,7 +3,7 @@
 return {
   "neko-night/nvim",
   priority = 1000,
-  lazy = false,
+  lazy = true,  -- Let Themery manage loading
   config = function()
   end,
 }
diff --git a/config/nvim/lua/themes/nightfly.lua b/config/nvim/lua/themes/nightfly.lua
index 46a5a360..615c445e 100644
--- a/config/nvim/lua/themes/nightfly.lua
+++ b/config/nvim/lua/themes/nightfly.lua
@@ -3,7 +3,7 @@
 return {
     "bluz71/vim-nightfly-colors",
     name = "nightfly",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     config = function()
         -- Optional: set nightfly options here
diff --git a/config/nvim/lua/themes/nordic.lua b/config/nvim/lua/themes/nordic.lua
index 4ecb315d..a73027e6 100644
--- a/config/nvim/lua/themes/nordic.lua
+++ b/config/nvim/lua/themes/nordic.lua
@@ -3,6 +3,6 @@
 return {
     'AlexvZyl/nordic.nvim',
     name = "nordic",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
diff --git a/config/nvim/lua/themes/one_monokai.lua b/config/nvim/lua/themes/one_monokai.lua
index f1b99664..65d6ce22 100644
--- a/config/nvim/lua/themes/one_monokai.lua
+++ b/config/nvim/lua/themes/one_monokai.lua
@@ -3,7 +3,7 @@
 return {
     "cpea2506/one_monokai.nvim",
     name = "one_monokai",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     opts = {},
     config = function()
diff --git a/config/nvim/lua/themes/onedark.lua b/config/nvim/lua/themes/onedark.lua
index 1533f971..e202e97b 100644
--- a/config/nvim/lua/themes/onedark.lua
+++ b/config/nvim/lua/themes/onedark.lua
@@ -3,7 +3,7 @@
 return {
     "navarasu/onedark.nvim",
     name = "onedark",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     config = function()
         require("onedark").setup({
diff --git a/config/nvim/lua/themes/onedarkpro.lua b/config/nvim/lua/themes/onedarkpro.lua
index bee9084c..48c24c62 100644
--- a/config/nvim/lua/themes/onedarkpro.lua
+++ b/config/nvim/lua/themes/onedarkpro.lua
@@ -3,6 +3,6 @@
 return {
     "olimorris/onedarkpro.nvim",
     name = "onedarkpro",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/oxocarbon.lua b/config/nvim/lua/themes/oxocarbon.lua
index 5095122c..56d0f3c7 100644
--- a/config/nvim/lua/themes/oxocarbon.lua
+++ b/config/nvim/lua/themes/oxocarbon.lua
@@ -3,6 +3,6 @@
 return {
     "nyoom-engineering/oxocarbon.nvim",
     name = "oxocarbon",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/palenight-fall.lua b/config/nvim/lua/themes/palenight-fall.lua
index 3650f1af..427e4304 100644
--- a/config/nvim/lua/themes/palenight-fall.lua
+++ b/config/nvim/lua/themes/palenight-fall.lua
@@ -3,6 +3,6 @@
 return {
     "JoosepAlviste/palenightfall.nvim",
     name = "palenightfall",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/papercolor.lua b/config/nvim/lua/themes/papercolor.lua
index efc45fc4..ccb66b46 100644
--- a/config/nvim/lua/themes/papercolor.lua
+++ b/config/nvim/lua/themes/papercolor.lua
@@ -3,6 +3,6 @@
 return {
     "NLKNguyen/papercolor-theme",
     name = "papercolor",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/penumbra.lua b/config/nvim/lua/themes/penumbra.lua
index a56c451a..67c12e4e 100644
--- a/config/nvim/lua/themes/penumbra.lua
+++ b/config/nvim/lua/themes/penumbra.lua
@@ -3,7 +3,7 @@
 return {
     "Allianaab2m/penumbra.nvim",
     name = "penumbra",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     opts = {
         -- Example options (uncomment and adjust as desired)
diff --git a/config/nvim/lua/themes/poimandres.lua b/config/nvim/lua/themes/poimandres.lua
index c223b53f..e7016867 100644
--- a/config/nvim/lua/themes/poimandres.lua
+++ b/config/nvim/lua/themes/poimandres.lua
@@ -2,7 +2,7 @@
 
 return { 
   'olivercederborg/poimandres.nvim',
-  lazy = false,
+  lazy = true,  -- Let Themery manage loading
   priority = 1000,
   config = function()
     require('poimandres').setup {
diff --git a/config/nvim/lua/themes/tokyonight.lua b/config/nvim/lua/themes/tokyonight.lua
index 95a7a119..dc226cf1 100644
--- a/config/nvim/lua/themes/tokyonight.lua
+++ b/config/nvim/lua/themes/tokyonight.lua
@@ -3,6 +3,6 @@
 return {
     "folke/tokyonight.nvim",
     name = "tokyonight",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
\ No newline at end of file
diff --git a/config/nvim/lua/themes/vscode-modern.lua b/config/nvim/lua/themes/vscode-modern.lua
index f3845234..dc909b8e 100644
--- a/config/nvim/lua/themes/vscode-modern.lua
+++ b/config/nvim/lua/themes/vscode-modern.lua
@@ -3,7 +3,7 @@
 return {
     "gmr458/vscode_modern_theme.nvim",
     name = "vscode_modern",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
     config = function()
         require("vscode_modern").setup({
diff --git a/config/nvim/lua/themes/zenburn.lua b/config/nvim/lua/themes/zenburn.lua
index a3c2ceb3..176a3e5b 100644
--- a/config/nvim/lua/themes/zenburn.lua
+++ b/config/nvim/lua/themes/zenburn.lua
@@ -3,6 +3,6 @@
 return {
     "jnurmine/Zenburn",
     name = "zenburn",
-    lazy = false,
+    lazy = true,  -- Let Themery manage loading
     priority = 1000,
 }
diff --git a/config/nvim/lua/themes/zephyrium.lua b/config/nvim/lua/themes/zephyrium.lua
index 676a43d3..709fd36d 100644
--- a/config/nvim/lua/themes/zephyrium.lua
+++ b/config/nvim/lua/themes/zephyrium.lua
@@ -3,7 +3,7 @@
 return {
   "titanzero/zephyrium",
   priority = 1000,
-  lazy = false,
+  lazy = true,  -- Let Themery manage loading
   config = function()
   end,
 }

From c287a6af627c6a7d0868153ad5cae553db2d0807 Mon Sep 17 00:00:00 2001
From: redjax <5534031+redjax@users.noreply.github.com>
Date: Mon, 22 Sep 2025 12:07:50 -0400
Subject: [PATCH 6/6] fix(theme): Attempt to fix aura theme

---
 config/nvim/lua/themes/aura.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/nvim/lua/themes/aura.lua b/config/nvim/lua/themes/aura.lua
index 78474a37..f77f33f0 100644
--- a/config/nvim/lua/themes/aura.lua
+++ b/config/nvim/lua/themes/aura.lua
@@ -3,7 +3,7 @@
 return {
     "daltonmenezes/aura-theme",
     name = "aura-theme",
-    lazy = true,  -- Let Themery manage loading
+    lazy = false,  -- Need to load immediately for special rtp setup
     priority = 1000,
     config = function(plugin)
       vim.opt.rtp:append(plugin.dir .. "/packages/neovim")