diff --git a/lua/taken/core/remaps.lua b/lua/taken/core/remaps.lua
index e973a15..3682c04 100644
--- a/lua/taken/core/remaps.lua
+++ b/lua/taken/core/remaps.lua
@@ -41,8 +41,12 @@ set("n", "<leader><leader>", function()
     vim.cmd("so")
 end, { desc = "Source current file" })
 
--- telescope
 
+set("n", "<leader>ht", function()
+    require("taken.functions.themeselecter").themeselector()
+end)
+
+-- telescope
 set("n", "<leader>ff", "<cmd>Telescope find_files<CR>", { desc = "Find files" })
 set("n", "<leader>fg", "<cmd>Telescope live_grep<CR>", { desc = "Live grep" })
 set("n", "<leader>fb", "<cmd>Telescope buffers<CR>", { desc = "Find buffers" })
@@ -51,7 +55,6 @@ set("n", "<leader>fh", "<cmd>Telescope help_tags<CR>", { desc = "Help tags" })
 set("n", "<leader>fp", "<cmd>Telescope project<CR>", { desc = "Find projects" })
 set("n", "<leader>fd", "<cmd>Telescope file_browser<CR>", { desc = "File browser" })
 set("n", "<leader>fr", "<cmd>Telescope reloader<CR>", { desc = "Reload config" })
-set("n", "<leader>ht", "<cmd>Telescope colorscheme<CR>", { desc = "Colorscheme" })
 set("n", "<leader>fc", "<cmd>Telescope commands<CR>", { desc = "Commands" })
 
 -- window movement
diff --git a/lua/taken/functions/themeselecter.lua b/lua/taken/functions/themeselecter.lua
new file mode 100644
index 0000000..a28ed4b
--- /dev/null
+++ b/lua/taken/functions/themeselecter.lua
@@ -0,0 +1,42 @@
+local M = {}
+
+function M.themeselector()
+    local themes = {
+        "rose-pine-main",
+        "rose-pine-moon",
+        "rose-pine-dawn",
+        "catppuccin-mocha",
+        "catppuccin-latte",
+        "nightfly",
+        "tokyonight-night",
+        "tokyonight-storm",
+        "tokyonight-moon",
+        "tokyonight-day",
+        "dracula",
+        "dracula-soft",
+        "OceanicNext",
+        "onelight",
+        "onedark",
+        "onedark_dark",
+        "onedark_vivid",
+        "doom-one",
+        "moonlight",
+        "mellow",
+        "ofirkai",
+        "kanagawa-lotus",
+        "kanagawa-dragon",
+        "kanagawa-wave",
+    }
+
+    local opts = {
+        prompt = "Select a theme",
+    }
+
+    local exec = function(choice)
+        vim.cmd("colorscheme " .. choice)
+    end
+
+    vim.ui.select(themes, opts, exec)
+end
+
+return M