diff --git a/init.lua b/init.lua
index 2442865..0c93267 100644
--- a/init.lua
+++ b/init.lua
@@ -95,9 +95,9 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.lang.yaml" },
     { import = "lazyvim.plugins.extras.editor.telescope" },
     { import = "plugins" },
+    { import = "themes" },
   },
   defaults = { lazy = false, version = false },
-  install = { colorscheme = {} },
   checker = { enabled = true },
   performance = {
     rtp = {
diff --git a/lua/plugins/ayu.lua b/lua/themes/ayu.lua
similarity index 100%
rename from lua/plugins/ayu.lua
rename to lua/themes/ayu.lua
diff --git a/lua/themes/dracula.lua b/lua/themes/dracula.lua
new file mode 100644
index 0000000..c2569ae
--- /dev/null
+++ b/lua/themes/dracula.lua
@@ -0,0 +1,7 @@
+-- -----------------------------------------------------------------------------
+-- --------------------------------- Dracula -----------------------------------
+-- -----------------------------------------------------------------------------
+return {
+  "Mofiqul/dracula.nvim",
+  lazy = true,
+}
\ No newline at end of file
diff --git a/lua/themes/github-theme.lua b/lua/themes/github-theme.lua
new file mode 100644
index 0000000..bc5607b
--- /dev/null
+++ b/lua/themes/github-theme.lua
@@ -0,0 +1,7 @@
+-- -----------------------------------------------------------------------------
+-- ---------------------------- Github Nvim Theme ------------------------------
+-- -----------------------------------------------------------------------------
+return {
+  "projekt0n/github-nvim-theme",
+  lazy = true,
+}
diff --git a/lua/themes/gruvbox.lua b/lua/themes/gruvbox.lua
new file mode 100644
index 0000000..29c57f0
--- /dev/null
+++ b/lua/themes/gruvbox.lua
@@ -0,0 +1,4 @@
+return {
+  "ellisonleao/gruvbox.nvim",
+  lazy = true,
+}
diff --git a/lua/themes/kanagawa.lua b/lua/themes/kanagawa.lua
new file mode 100644
index 0000000..b64c4e7
--- /dev/null
+++ b/lua/themes/kanagawa.lua
@@ -0,0 +1,7 @@
+-- -----------------------------------------------------------------------------
+-- -------------------------------- Kanagawa -----------------------------------
+-- -----------------------------------------------------------------------------
+return {
+  "rebelot/kanagawa.nvim",
+  lazy = true,
+}
diff --git a/lua/themes/neofusion.lua b/lua/themes/neofusion.lua
new file mode 100644
index 0000000..74b7e29
--- /dev/null
+++ b/lua/themes/neofusion.lua
@@ -0,0 +1,4 @@
+return {
+  "diegoulloao/neofusion.nvim",
+  lazy = true,
+}
diff --git a/lua/themes/nord.lua b/lua/themes/nord.lua
new file mode 100644
index 0000000..2a2ae85
--- /dev/null
+++ b/lua/themes/nord.lua
@@ -0,0 +1,7 @@
+-- -----------------------------------------------------------------------------
+-- ---------------------------------- Nord -------------------------------------
+-- -----------------------------------------------------------------------------
+return {
+  "shaunsingh/nord.nvim",
+  lazy = true,
+}
diff --git a/lua/themes/one-dark-pro.lua b/lua/themes/one-dark-pro.lua
new file mode 100644
index 0000000..d609698
--- /dev/null
+++ b/lua/themes/one-dark-pro.lua
@@ -0,0 +1,7 @@
+-- -----------------------------------------------------------------------------
+-- ------------------------------ One Dark Pro ---------------------------------
+-- -----------------------------------------------------------------------------
+return {
+  "olimorris/onedarkpro.nvim",
+  lazy = true,
+}
diff --git a/lua/themes/oxocarbon.lua b/lua/themes/oxocarbon.lua
new file mode 100644
index 0000000..e314ab3
--- /dev/null
+++ b/lua/themes/oxocarbon.lua
@@ -0,0 +1,4 @@
+return {
+  "nyoom-engineering/oxocarbon.nvim",
+  lazy = true,
+}
diff --git a/lua/plugins/rose-pine.lua b/lua/themes/rose-pine.lua
similarity index 79%
rename from lua/plugins/rose-pine.lua
rename to lua/themes/rose-pine.lua
index 3260f59..247e87b 100644
--- a/lua/plugins/rose-pine.lua
+++ b/lua/themes/rose-pine.lua
@@ -1,5 +1,5 @@
 -- -----------------------------------------------------------------------------
--- -------------------------------- rose-pine ----------------------------------
+-- -------------------------------- Rose Pine ----------------------------------
 -- -----------------------------------------------------------------------------
 return {
   "rose-pine/neovim",
diff --git a/lua/themes/umbra.lua b/lua/themes/umbra.lua
new file mode 100644
index 0000000..bf17bcf
--- /dev/null
+++ b/lua/themes/umbra.lua
@@ -0,0 +1,7 @@
+-- -----------------------------------------------------------------------------
+-- ------------------------------ One Dark Pro ---------------------------------
+-- -----------------------------------------------------------------------------
+return {
+  "LZDQ/umbra.nvim",
+  lazy = true,
+}