diff --git a/init.lua b/init.lua
index bdfe221a..2f3b7a70 100644
--- a/init.lua
+++ b/init.lua
@@ -91,26 +91,6 @@ require('lazy').setup({
     },
   },
 
-  {
-    'jacoborus/tender.vim',
-    priority = 1000,
-    config = function()
-      vim.cmd.colorscheme 'tender'
-    end,
-  },
-
-  {
-    'nvim-lualine/lualine.nvim',
-    opts = {
-      options = {
-        icons_enabled = true,
-        theme = 'tender',
-        component_separators = '|',
-        section_separators = '',
-      },
-    },
-  },
-
   {
     'github/copilot.vim',
     config = function()
diff --git a/lazy-lock.json b/lazy-lock.json
index 84a5a4b6..a279cb51 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -28,7 +28,7 @@
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
-  "tender.vim": { "branch": "master", "commit": "7746453a045eaa97dc413a7209268345f33f3243" },
+  "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
   "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
   "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
diff --git a/lua/custom/plugins/colorscheme.lua b/lua/custom/plugins/colorscheme.lua
new file mode 100644
index 00000000..c806a3c9
--- /dev/null
+++ b/lua/custom/plugins/colorscheme.lua
@@ -0,0 +1,39 @@
+return {
+  -- {
+  --   'jacoborus/tender.vim',
+  --   priority = 1000,
+  --   config = function()
+  --     vim.cmd.colorscheme 'tender'
+  --   end,
+  -- },
+
+  -- {
+  --   "ronisbr/nano-theme.nvim",
+  --   priority = 1000,
+  --   config = function()
+  --   end
+  -- },
+
+  {
+    "folke/tokyonight.nvim",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      vim.cmd.colorscheme 'tokyonight-moon'
+    end,
+  },
+
+  -- Lualine config
+  {
+    'nvim-lualine/lualine.nvim',
+    opts = {
+      options = {
+        icons_enabled = true,
+        theme = 'tokyonight',
+        component_separators = '|',
+        section_separators = '',
+      },
+    },
+  },
+
+}