diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 3c80265..82b3454 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,15 +1,15 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" },
-  "aerial.nvim": { "branch": "master", "commit": "8e4090bf9412e24b05823c771cb3956c2ba72981" },
+  "LuaSnip": { "branch": "master", "commit": "c7984d1cca3d8615e4daefc196597872a0b8d590" },
+  "aerial.nvim": { "branch": "master", "commit": "fb1f08c9f90e8b0c04b2f2c5d95d06288a14c5b2" },
   "ai.nvim": { "branch": "main", "commit": "ab6b6f54612500f48d4d34fcf81529946b9338f3" },
   "asyncrun.vim": { "branch": "master", "commit": "61cc3081963a12048e00e89f8cedc8bd1cb83b8c" },
   "auto-session": { "branch": "main", "commit": "3eb26b949e1b90798e84926848551046e2eb0721" },
   "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" },
   "catppuccin": { "branch": "main", "commit": "d7521f6050b94cb0e23067f63829d86886f870fe" },
-  "ciderlsp-nvim": { "branch": "main", "commit": "00a86f96f4b8b9e94f0978c2db316447cc30a573" },
+  "ciderlsp-nvim": { "branch": "main", "commit": "f4929e4e00c1136eb88fe685ffe8a9eb7c86dcd9" },
   "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
+  "cmp-calc": { "branch": "main", "commit": "50792f34a628ea6eb31d2c90e8df174671e4e7a0" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
   "cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
   "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
@@ -41,7 +41,7 @@
   "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
   "lsp-lens.nvim": { "branch": "main", "commit": "34b6aa13b0196d6b0d5a87cca6d7104ac5071a59" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "bb874e8d832b66fa734b7b048d52eb9ed736bdcf" },
+  "lsp-zero.nvim": { "branch": "v2.x", "commit": "ffebf6f7b0649f1eb81b37c37b75552f8ff96337" },
   "lsp_lines.nvim": { "branch": "main", "commit": "cf2306dd332e34a3e91075b40bdd4f6db824b2ee" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
@@ -49,11 +49,13 @@
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" },
   "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" },
+  "mellifluous.nvim": { "branch": "main", "commit": "b0e7d7753331c181633dbaf11b23633c0f72341d" },
   "mini.splitjoin": { "branch": "main", "commit": "5f4237ae557f255a1f1a435c76c6a715be39060a" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
   "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "483019d251c31acd14102bc279f938f98d9a3de6" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
   "neoscopes": { "branch": "main", "commit": "d3f92e9360da7b7ab4eb6c5811d5ebaf7135239f" },
+  "neovim-ayu": { "branch": "master", "commit": "76dbf939b38e03ac5f9bd711ab3e434999f715c8" },
   "neovim-throttle-debounce": { "branch": "main", "commit": "5247b097df15016ab31db672b77ec4938bb9cbfd" },
   "nerdcommenter": { "branch": "master", "commit": "da948e160d9f54c2967c7927b9c74c5a68c8dc49" },
   "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" },
@@ -70,6 +72,7 @@
   "nvim-treesitter": { "branch": "master", "commit": "96f55f304332ca6ea1b7dde32d3ec04b5298c316" },
   "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" },
   "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "53edfb413a54c9e55dcddc9e9fa4977a897e4425" },
+  "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "refactoring.nvim": { "branch": "master", "commit": "5831194debd23920a32abd9fefd5dddba44e34fc" },
   "registers.nvim": { "branch": "main", "commit": "7a16c6e6fe96f3c9c8bb55b95047d745dd34ca4d" },
@@ -90,7 +93,7 @@
   "vim-conjoin": { "branch": "master", "commit": "2ea3b8ed994d12bbf255825d973d865621c64860" },
   "vim-floaterm": { "branch": "master", "commit": "6e81602e9d7ff7dc1c96c66fedc38fca1262d57c" },
   "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" },
-  "vim-imp": { "branch": "main", "commit": "bf03e3754602bcd385e96a6f7c2b89740d501f57" },
+  "vim-imp": { "branch": "main", "commit": "770c65e23e9d13b76126bfee3715a6345adf518e" },
   "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
   "vim-matchup": { "branch": "master", "commit": "d30b72d20f01478a8486f15a57c89fe3177373db" },
   "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },
diff --git a/vim/.vim/lua/plugins/catppuccin.lua b/vim/.vim/lua/plugins/catppuccin.lua
deleted file mode 100644
index b54309e..0000000
--- a/vim/.vim/lua/plugins/catppuccin.lua
+++ /dev/null
@@ -1,79 +0,0 @@
-return {
-	"catppuccin/nvim",
-	name = "catppuccin",
-	lazy = false, -- make sure we load this during startup if it is your main colorscheme
-	priority = 1000, -- make sure to load this before all the other start plugins
-	config = function()
-		vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
-		local colors = require("catppuccin.palettes").get_palette()
-
-		require("catppuccin").setup({
-			flavour = "macchiato",
-			integrations = {
-				cmp = true,
-				-- coc_nvim = false,
-				dashboard = true,
-				-- fern = false,
-				fidget = true,
-				gitgutter = true,
-				gitsigns = true,
-				-- hop = false,
-				-- illuminate = false,
-				-- leap = false,
-				-- lightspeed = false,
-				-- lsp_saga = false,
-				lsp_trouble = true,
-				mason = true,
-				markdown = true,
-				-- neogit = false,
-				-- neotest = false,
-				neotree = true,
-				notify = true,
-				-- nvimtree = true,
-				-- overseer = false,
-				-- pounce = false,
-				symbols_outline = true,
-				telescope = true,
-				treesitter = true,
-				treesitter_context = false,
-				-- ts_rainbow = false,
-				-- vim_sneak = false,
-				-- vimwiki = false,
-				which_key = true,
-
-				-- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
-				dap = {
-					enabled = false,
-					enable_ui = false,
-				},
-				indent_blankline = {
-					enabled = true,
-					colored_indent_levels = false,
-				},
-				native_lsp = {
-					enabled = true,
-					virtual_text = {
-						errors = { "italic" },
-						hints = { "italic" },
-						warnings = { "italic" },
-						information = { "italic" },
-					},
-					underlines = {
-						errors = { "underline" },
-						hints = { "underline" },
-						warnings = { "underline" },
-						information = { "underline" },
-					},
-				},
-			},
-			custom_highlights = {
-				Identifier = { fg = colors.lavender },
-				Statement = { fg = colors.rosewater },
-				-- Identifier = { fg = colors.sapphire },
-				Function = { fg = colors.mauve },
-			},
-		})
-
-		vim.api.nvim_command("colorscheme catppuccin")
-	end,
-}
diff --git a/vim/.vim/lua/plugins/themes.lua b/vim/.vim/lua/plugins/themes.lua
new file mode 100644
index 0000000..cd26842
--- /dev/null
+++ b/vim/.vim/lua/plugins/themes.lua
@@ -0,0 +1,117 @@
+local use_google = require("utils").use_google
+
+return {
+	{
+		"Shatur/neovim-ayu",
+		priority = 1000, -- make sure to load this before all the other start plugins
+		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+		cond = use_google(),
+		config = function()
+			require("ayu").setup({
+				mirage = false, -- Set to `true` to use `mirage` variant instead of `dark` for dark background.
+				overrides = {}, -- A dictionary of group names, each associated with a dictionary of parameters (`bg`, `fg`, `sp` and `style`) and colors in hex.
+				vim.cmd("colorscheme ayu"),
+			})
+		end,
+	},
+	{
+		"ramojus/mellifluous.nvim",
+		priority = 1000, -- make sure to load this before all the other start plugins
+		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+		cond = use_google(),
+		config = function()
+			require("mellifluous").setup({ --[[...]]
+			}) -- optional, see configuration section.
+			-- vim.cmd("colorscheme mellifluous")
+		end,
+	},
+	{
+		"ful1e5/onedark.nvim",
+		priority = 1000, -- make sure to load this before all the other start plugins
+		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+		cond = use_google(),
+		config = function()
+			-- require("onedark").setup()
+		end,
+	},
+	{
+		"catppuccin/nvim",
+		name = "catppuccin",
+		priority = 1000, -- make sure to load this before all the other start plugins
+		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+		cond = use_google(),
+		config = function()
+			vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
+			local colors = require("catppuccin.palettes").get_palette()
+
+			require("catppuccin").setup({
+				flavour = "macchiato",
+				integrations = {
+					cmp = true,
+					-- coc_nvim = false,
+					dashboard = true,
+					-- fern = false,
+					fidget = true,
+					gitgutter = true,
+					gitsigns = true,
+					-- hop = false,
+					-- illuminate = false,
+					-- leap = false,
+					-- lightspeed = false,
+					-- lsp_saga = false,
+					lsp_trouble = true,
+					mason = true,
+					markdown = true,
+					-- neogit = false,
+					-- neotest = false,
+					neotree = true,
+					notify = true,
+					-- nvimtree = true,
+					-- overseer = false,
+					-- pounce = false,
+					symbols_outline = true,
+					telescope = true,
+					treesitter = true,
+					treesitter_context = false,
+					-- ts_rainbow = false,
+					-- vim_sneak = false,
+					-- vimwiki = false,
+					which_key = true,
+
+					-- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
+					dap = {
+						enabled = false,
+						enable_ui = false,
+					},
+					indent_blankline = {
+						enabled = true,
+						colored_indent_levels = false,
+					},
+					native_lsp = {
+						enabled = true,
+						virtual_text = {
+							errors = { "italic" },
+							hints = { "italic" },
+							warnings = { "italic" },
+							information = { "italic" },
+						},
+						underlines = {
+							errors = { "underline" },
+							hints = { "underline" },
+							warnings = { "underline" },
+							information = { "underline" },
+						},
+					},
+				},
+				custom_highlights = {
+					Identifier = { fg = colors.lavender },
+					Statement = { fg = colors.rosewater },
+					-- Identifier = { fg = colors.sapphire },
+					Function = { fg = colors.mauve },
+				},
+			})
+
+			-- vim.api.nvim_command("colorscheme catppuccin")
+		end,
+	},
+}