diff --git a/lua/plugins/themes.lua b/lua/plugins/themes.lua
new file mode 100644
index 0000000..3b7c0e0
--- /dev/null
+++ b/lua/plugins/themes.lua
@@ -0,0 +1,49 @@
+-- -----------------------------------------------------------------------------
+-- --------------------------------- THEMES ------------------------------------
+-- -----------------------------------------------------------------------------
+
+return {
+  {
+    "Shatur/neovim-ayu",
+  },
+  {
+    "Mofiqul/dracula.nvim",
+  },
+  {
+    "eldritch-theme/eldritch.nvim",
+  },
+  {
+    "projekt0n/github-nvim-theme",
+  },
+  {
+    "ellisonleao/gruvbox.nvim",
+  },
+  {
+    "rebelot/kanagawa.nvim",
+  },
+  {
+    "kdheepak/monochrome.nvim",
+  },
+  {
+    "diegoulloao/neofusion.nvim",
+  },
+  {
+    "shaunsingh/nord.nvim",
+  },
+  {
+    "olimorris/onedarkpro.nvim",
+  },
+  {
+    "nyoom-engineering/oxocarbon.nvim",
+  },
+  {
+    "https://gitlab.com/yorickpeterse/vim-paper.git",
+  },
+  {
+    "rose-pine/neovim",
+    name = "rose-pine",
+  },
+  {
+    "LZDQ/umbra.nvim",
+  },
+}
diff --git a/lua/themes/ayu.lua b/lua/themes/ayu.lua
deleted file mode 100644
index 385bc55..0000000
--- a/lua/themes/ayu.lua
+++ /dev/null
@@ -1,8 +0,0 @@
--- -----------------------------------------------------------------------------
--- ----------------------------------- Ayu -------------------------------------
--- -----------------------------------------------------------------------------
-return {
-  "Shatur/neovim-ayu",
-  lazy = true,
-}
-
diff --git a/lua/themes/dracula.lua b/lua/themes/dracula.lua
deleted file mode 100644
index 7694ecb..0000000
--- a/lua/themes/dracula.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- -----------------------------------------------------------------------------
--- --------------------------------- Dracula -----------------------------------
--- -----------------------------------------------------------------------------
-return {
-  "Mofiqul/dracula.nvim",
-}
\ No newline at end of file
diff --git a/lua/themes/eldritch.lua b/lua/themes/eldritch.lua
deleted file mode 100644
index 747d5e3..0000000
--- a/lua/themes/eldritch.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-  "eldritch-theme/eldritch.nvim",
-}
diff --git a/lua/themes/github-theme.lua b/lua/themes/github-theme.lua
deleted file mode 100644
index 680e940..0000000
--- a/lua/themes/github-theme.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- -----------------------------------------------------------------------------
--- ---------------------------- Github Nvim Theme ------------------------------
--- -----------------------------------------------------------------------------
-return {
-  "projekt0n/github-nvim-theme",
-}
diff --git a/lua/themes/gruvbox.lua b/lua/themes/gruvbox.lua
deleted file mode 100644
index 4076712..0000000
--- a/lua/themes/gruvbox.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-  "ellisonleao/gruvbox.nvim",
-}
diff --git a/lua/themes/kanagawa.lua b/lua/themes/kanagawa.lua
deleted file mode 100644
index 7c0fead..0000000
--- a/lua/themes/kanagawa.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- -----------------------------------------------------------------------------
--- -------------------------------- Kanagawa -----------------------------------
--- -----------------------------------------------------------------------------
-return {
-  "rebelot/kanagawa.nvim",
-}
diff --git a/lua/themes/monochrome.lua b/lua/themes/monochrome.lua
deleted file mode 100644
index b043d0d..0000000
--- a/lua/themes/monochrome.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-  "kdheepak/monochrome.nvim",
-}
diff --git a/lua/themes/neofusion.lua b/lua/themes/neofusion.lua
deleted file mode 100644
index d56e2ac..0000000
--- a/lua/themes/neofusion.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-  "diegoulloao/neofusion.nvim",
-}
diff --git a/lua/themes/nord.lua b/lua/themes/nord.lua
deleted file mode 100644
index a3643e6..0000000
--- a/lua/themes/nord.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- -----------------------------------------------------------------------------
--- ---------------------------------- Nord -------------------------------------
--- -----------------------------------------------------------------------------
-return {
-  "shaunsingh/nord.nvim",
-}
diff --git a/lua/themes/one-dark-pro.lua b/lua/themes/one-dark-pro.lua
deleted file mode 100644
index 4e5c28d..0000000
--- a/lua/themes/one-dark-pro.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- -----------------------------------------------------------------------------
--- ------------------------------ One Dark Pro ---------------------------------
--- -----------------------------------------------------------------------------
-return {
-  "olimorris/onedarkpro.nvim",
-}
diff --git a/lua/themes/oxocarbon.lua b/lua/themes/oxocarbon.lua
deleted file mode 100644
index ecc5c1a..0000000
--- a/lua/themes/oxocarbon.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-  "nyoom-engineering/oxocarbon.nvim",
-}
diff --git a/lua/themes/paper.lua b/lua/themes/paper.lua
deleted file mode 100644
index de39a69..0000000
--- a/lua/themes/paper.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
-  "https://gitlab.com/yorickpeterse/vim-paper.git",
-}
diff --git a/lua/themes/rose-pine.lua b/lua/themes/rose-pine.lua
deleted file mode 100644
index b3725e5..0000000
--- a/lua/themes/rose-pine.lua
+++ /dev/null
@@ -1,7 +0,0 @@
--- -----------------------------------------------------------------------------
--- -------------------------------- Rose Pine ----------------------------------
--- -----------------------------------------------------------------------------
-return {
-  "rose-pine/neovim",
-  name = "rose-pine",
-}
diff --git a/lua/themes/umbra.lua b/lua/themes/umbra.lua
deleted file mode 100644
index f2fb85c..0000000
--- a/lua/themes/umbra.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- -----------------------------------------------------------------------------
--- ------------------------------ One Dark Pro ---------------------------------
--- -----------------------------------------------------------------------------
-return {
-  "LZDQ/umbra.nvim",
-}