diff --git a/nvim/after/plugin/catppuccin.lua b/nvim/after/plugin/catppuccin.lua
new file mode 100644
index 0000000..e4f1c08
--- /dev/null
+++ b/nvim/after/plugin/catppuccin.lua
@@ -0,0 +1,9 @@
+-- Catppuccin Theme – https://github.com/catppuccin/catppuccin
+local status_ok, catppucin = pcall(require, "catppuccin")
+if not status_ok then
+	return
+end
+
+vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha
+
+require("catppuccin").setup()
diff --git a/nvim/lua/kogakure/colorscheme.lua b/nvim/lua/kogakure/colorscheme.lua
index 9e2e8a6..6ec6d9e 100644
--- a/nvim/lua/kogakure/colorscheme.lua
+++ b/nvim/lua/kogakure/colorscheme.lua
@@ -9,14 +9,8 @@ if not status_ok then
 	return
 end
 
--- Catppuccin Theme
-vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha
-require("catppuccin").setup()
-
--- Set colorscheme and additional colors
 vim.cmd([[
-colorscheme tokyonight-night
-
+silent! colorscheme tokyonight-night
 highlight ColorColumn guibg=#202224
 highlight SpellBad guifg=red
 ]])