diff --git a/pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua b/pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua
index 8d05a5b..054ff29 100644
--- a/pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua
+++ b/pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua
@@ -10,6 +10,7 @@ return {
 			vim.api.nvim_create_autocmd("User", {
 				pattern = "LazyReload",
 				callback = function()
+					-- Unload the theme module
 					package.loaded["plugins.theme"] = nil
 
 					vim.schedule(function()
@@ -18,18 +19,63 @@ return {
 							return
 						end
 
+						-- Find the theme plugin and unload it
+						local theme_plugin_name = nil
+						for _, spec in ipairs(theme_spec) do
+							if spec[1] and spec[1] ~= "LazyVim/LazyVim" then
+								theme_plugin_name = spec.name or spec[1]
+								break
+							end
+						end
+
+						-- Clear all highlight groups before applying new theme
+						vim.cmd("highlight clear")
+						if vim.fn.exists("syntax_on") then
+							vim.cmd("syntax reset")
+						end
+
+						-- Reset background to default so colorscheme can set it properly (light themes will set to light)
+						vim.o.background = "dark"
+
+						-- Unload theme plugin modules to force full reload
+						if theme_plugin_name then
+							local plugin = require("lazy.core.config").plugins[theme_plugin_name]
+							if plugin then
+								-- Unload all lua modules from the plugin directory
+								local plugin_dir = plugin.dir .. "/lua"
+								require("lazy.core.util").walkmods(plugin_dir, function(modname)
+									package.loaded[modname] = nil
+									package.preload[modname] = nil
+								end)
+							end
+						end
+
+						-- Find and apply the new colorscheme
 						for _, spec in ipairs(theme_spec) do
 							if spec[1] == "LazyVim/LazyVim" and spec.opts and spec.opts.colorscheme then
 								local colorscheme = spec.opts.colorscheme
 
+								-- Load the colorscheme plugin
 								require("lazy.core.loader").colorscheme(colorscheme)
 
 								vim.defer_fn(function()
+									-- Apply the colorscheme (it will set background itself)
 									pcall(vim.cmd.colorscheme, colorscheme)
 
+									-- Force redraw to update all UI elements
+									vim.cmd("redraw!")
+
+									-- Reload transparency settings
 									if vim.fn.filereadable(transparency_file) == 1 then
 										vim.defer_fn(function()
 											vim.cmd.source(transparency_file)
+
+											-- Trigger UI updates for various plugins
+											vim.api.nvim_exec_autocmds("ColorScheme", { modeline = false })
+											vim.api.nvim_exec_autocmds("VimEnter", { modeline = false })
+
+											-- Final redraw
+											vim.cmd("redraw!")
 										end, 5)
 									end
 								end, 5)