diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json
deleted file mode 100644
index 71fc8325..00000000
--- a/config/nvim/lazyvim.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extras": [
-    "lazyvim.plugins.extras.editor.neo-tree"
-  ],
-  "install_version": 8,
-  "news": {
-    "NEWS.md": "10960"
-  },
-  "version": 8
-}
\ No newline at end of file
diff --git a/config/nvim/lua/plugins/all-themes.lua b/config/nvim/lua/plugins/all-themes.lua
deleted file mode 100644
index 4c38f98f..00000000
--- a/config/nvim/lua/plugins/all-themes.lua
+++ /dev/null
@@ -1,61 +0,0 @@
-return {
-  -- Load all theme plugins but don't apply them
-  -- This ensures all colorschemes are available for hot-reloading
-  {
-    "ribru17/bamboo.nvim",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "catppuccin/nvim",
-    name = "catppuccin",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "sainnhe/everforest",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "kepano/flexoki-neovim",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "ellisonleao/gruvbox.nvim",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "rebelot/kanagawa.nvim",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "tahayvr/matteblack.nvim",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "loctvl842/monokai-pro.nvim",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "shaunsingh/nord.nvim",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "rose-pine/neovim",
-    name = "rose-pine",
-    lazy = true,
-    priority = 1000,
-  },
-  {
-    "folke/tokyonight.nvim",
-    lazy = true,
-    priority = 1000,
-  },
-}
diff --git a/config/nvim/lua/plugins/omarchy-theme-hotreload.lua b/config/nvim/lua/plugins/omarchy-theme-hotreload.lua
deleted file mode 100644
index 8d05a5b8..00000000
--- a/config/nvim/lua/plugins/omarchy-theme-hotreload.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-return {
-	{
-		name = "theme-hotreload",
-		dir = vim.fn.stdpath("config"),
-		lazy = false,
-		priority = 1000,
-		config = function()
-			local transparency_file = vim.fn.stdpath("config") .. "/plugin/after/transparency.lua"
-
-			vim.api.nvim_create_autocmd("User", {
-				pattern = "LazyReload",
-				callback = function()
-					package.loaded["plugins.theme"] = nil
-
-					vim.schedule(function()
-						local ok, theme_spec = pcall(require, "plugins.theme")
-						if not ok then
-							return
-						end
-
-						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
-
-								require("lazy.core.loader").colorscheme(colorscheme)
-
-								vim.defer_fn(function()
-									pcall(vim.cmd.colorscheme, colorscheme)
-
-									if vim.fn.filereadable(transparency_file) == 1 then
-										vim.defer_fn(function()
-											vim.cmd.source(transparency_file)
-										end, 5)
-									end
-								end, 5)
-
-								break
-							end
-						end
-					end)
-				end,
-			})
-		end,
-	},
-}
diff --git a/config/nvim/lua/plugins/snacks-animated-scrolling-off.lua b/config/nvim/lua/plugins/snacks-animated-scrolling-off.lua
deleted file mode 100644
index cbb0a58e..00000000
--- a/config/nvim/lua/plugins/snacks-animated-scrolling-off.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-	"folke/snacks.nvim",
-	opts = {
-		scroll = {
-			enabled = false, -- Disable scrolling animations
-		},
-	},
-}
diff --git a/config/nvim/plugin/after/transparency.lua b/config/nvim/plugin/after/transparency.lua
deleted file mode 100644
index d0090f07..00000000
--- a/config/nvim/plugin/after/transparency.lua
+++ /dev/null
@@ -1,45 +0,0 @@
--- transparent background
-vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-vim.api.nvim_set_hl(0, "FloatBorder", { bg = "none" })
-vim.api.nvim_set_hl(0, "Pmenu", { bg = "none" })
-vim.api.nvim_set_hl(0, "Terminal", { bg = "none" })
-vim.api.nvim_set_hl(0, "EndOfBuffer", { bg = "none" })
-vim.api.nvim_set_hl(0, "FoldColumn", { bg = "none" })
-vim.api.nvim_set_hl(0, "Folded", { bg = "none" })
-vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" })
-vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" })
-vim.api.nvim_set_hl(0, "WhichKeyFloat", { bg = "none" })
-vim.api.nvim_set_hl(0, "TelescopeBorder", { bg = "none" })
-vim.api.nvim_set_hl(0, "TelescopeNormal", { bg = "none" })
-vim.api.nvim_set_hl(0, "TelescopePromptBorder", { bg = "none" })
-vim.api.nvim_set_hl(0, "TelescopePromptTitle", { bg = "none" })
-
--- transparent background for neotree
-vim.api.nvim_set_hl(0, "NeoTreeNormal", { bg = "none" })
-vim.api.nvim_set_hl(0, "NeoTreeNormalNC", { bg = "none" })
-vim.api.nvim_set_hl(0, "NeoTreeVertSplit", { bg = "none" })
-vim.api.nvim_set_hl(0, "NeoTreeWinSeparator", { bg = "none" })
-vim.api.nvim_set_hl(0, "NeoTreeEndOfBuffer", { bg = "none" })
-
--- transparent background for nvim-tree
-vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" })
-vim.api.nvim_set_hl(0, "NvimTreeVertSplit", { bg = "none" })
-vim.api.nvim_set_hl(0, "NvimTreeEndOfBuffer", { bg = "none" })
-
--- transparent notify background
-vim.api.nvim_set_hl(0, "NotifyINFOBody", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyERRORBody", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyWARNBody", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyTRACEBody", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyDEBUGBody", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyINFOTitle", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyERRORTitle", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyWARNTitle", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyTRACETitle", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyDEBUGTitle", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyINFOBorder", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyERRORBorder", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyWARNBorder", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyTRACEBorder", { bg = "none" })
-vim.api.nvim_set_hl(0, "NotifyDEBUGBorder", { bg = "none" })
diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages
index 945c8231..70b43150 100644
--- a/install/omarchy-base.packages
+++ b/install/omarchy-base.packages
@@ -93,7 +93,7 @@ nvim
 obs-studio
 obsidian
 omarchy-chromium
-omarchy-lazyvim
+omarchy-nvim
 pamixer
 pinta
 playerctl
diff --git a/migrations/1760434895.sh b/migrations/1760434895.sh
new file mode 100644
index 00000000..e08649f4
--- /dev/null
+++ b/migrations/1760434895.sh
@@ -0,0 +1,6 @@
+echo "Change to omarchy-nvim package"
+omarchy-pkg-drop omarchy-lazyvim
+omarchy-pkg-add omarchy-nvim
+
+# Will trigger to overwrite configs or not to pickup new hot-reload themes
+omarchy-nvim-setup