diff --git a/nvim/lua/plugins/base16.lua b/nvim/lua/plugins/base16.lua
new file mode 100644
index 0000000..4920938
--- /dev/null
+++ b/nvim/lua/plugins/base16.lua
@@ -0,0 +1,4 @@
+--  https://github.com/chriskempson/base16-vim
+return {
+  "chriskempson/base16-vim",
+}
diff --git a/nvim/lua/plugins/catppuccin.lua b/nvim/lua/plugins/catppuccin.lua
new file mode 100644
index 0000000..a7ce1f1
--- /dev/null
+++ b/nvim/lua/plugins/catppuccin.lua
@@ -0,0 +1,4 @@
+--  https://github.com/catppuccin/nvim
+return {
+  { "catppuccin/nvim", name = "catppuccin" },
+}
diff --git a/nvim/lua/plugins/colorschemes.lua b/nvim/lua/plugins/colorschemes.lua
index a396a6d..3762c17 100644
--- a/nvim/lua/plugins/colorschemes.lua
+++ b/nvim/lua/plugins/colorschemes.lua
@@ -1,18 +1,9 @@
---  https://github.com/folke/tokyonight.nvim
---  https://github.com/chriskempson/base16-vim
---  https://github.com/kartikp10/noctis.nvim
---  https://github.com/catppuccin/nvim
+-- Configure LazyVim to load Tokyo Night
 return {
-  "folke/tokyonight.nvim", -- Tokyo Night color scheme
-  "chriskempson/base16-vim", -- Base16 colorschemes
-  { "kartikp10/noctis.nvim", dependencies = "rktjmp/lush.nvim" }, -- Noctis color scheme
-  { "catppuccin/nvim", name = "catppuccin" }, -- Catppuccin color scheme
-
-  -- Configure LazyVim to load Tokyo Night
   {
     "LazyVim/LazyVim",
     opts = {
-      colorscheme = "tokyonight-night",
+      colorscheme = "tokyonight",
     },
   },
 }
diff --git a/nvim/lua/plugins/noctis.lua b/nvim/lua/plugins/noctis.lua
new file mode 100644
index 0000000..f6e30dc
--- /dev/null
+++ b/nvim/lua/plugins/noctis.lua
@@ -0,0 +1,4 @@
+--  https://github.com/kartikp10/noctis.nvim
+return {
+  { "kartikp10/noctis.nvim", dependencies = "rktjmp/lush.nvim" }, -- Noctis color scheme
+}
diff --git a/nvim/lua/plugins/tokyonight.lua b/nvim/lua/plugins/tokyonight.lua
new file mode 100644
index 0000000..94e6f2f
--- /dev/null
+++ b/nvim/lua/plugins/tokyonight.lua
@@ -0,0 +1,6 @@
+--  https://github.com/folke/tokyonight.nvim
+return {
+  "folke/tokyonight.nvim",
+  lazy = true,
+  opts = { style = "night" },
+}