diff --git a/lua/catppuccino/config.lua b/lua/catppuccino/config.lua
index 89a606a..92c7102 100644
--- a/lua/catppuccino/config.lua
+++ b/lua/catppuccino/config.lua
@@ -23,22 +23,21 @@ config.options = {
 			}
 		},
 		lsp_trouble = false,
-		illuminate = false,
-		diff = false,
 		lsp_saga = false,
-		neogit = false,
 		gitgutter = false,
 		gitsigns = false,
 		telescope = false,
 		nvimtree = false,
-		fern = false,
-		dashboard = false,
 		which_key = false,
-		bufferline = false,
+		indent_blankline = false,
+		dashboard = false,
+		lualine = false,
+		lightline = false,
+		neogit = false,
+		vim_sneak = false,
+		fern = false,
 		barbar = false,
-		sneak = false,
-		hop = false,
-
+		bufferline = false,
 	}
 }
 
diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua
index 9ca0f46..228b2dd 100644
--- a/lua/catppuccino/core/mapper.lua
+++ b/lua/catppuccino/core/mapper.lua
@@ -3,11 +3,8 @@ local opts = require("catppuccino.config").options
 
 local M = {}
 
-function M.apply()
-    local theme = {}
-	local t = require("catppuccino.color_schemes." .. opts.colorscheme)
-
-    theme.base = {
+local function get_base(t)
+	return {
         Comment = {fg = t.comment, style = opts.styles.comments}, -- any comment
         ColorColumn = {bg = t.bg_visual}, -- used for the columns set with 'colorcolumn'
         Conceal = {fg = t.black}, -- placeholder characters substituted for concealed text (see 'conceallevel')
@@ -231,6 +228,13 @@ function M.apply()
         -- TSLiteral           = { };    -- Literal text.
         -- TSURI               = { };    -- Any URI like a link or email.
     }
+end
+
+function M.apply()
+    local theme = {}
+	local t = require("catppuccino.color_schemes." .. opts.colorscheme)
+
+    theme.base = get_base(t)
 
     theme.plugins = {
         -- LspTrouble