diff --git a/lua/integrations/cmp.lua b/lua/integrations/cmp.lua
index 461fae5..f7d03c9 100644
--- a/lua/integrations/cmp.lua
+++ b/lua/integrations/cmp.lua
@@ -1,33 +1,40 @@
-local theme = require("base46").get_colors "base_16"
-local base_30 = require("base46").get_colors "base_30"
+local base16 = require("base46").get_colors "base_16"
+local colors = require("base46").get_colors "base_30"
 
 return {
-   CmpItemKindConstant = { fg = theme.base09 },
-   CmpItemKindFunction = { fg = theme.base0D },
-   CmpItemKindIdentifier = { fg = theme.base08 },
-   CmpItemKindField = { fg = theme.base08 },
-   CmpItemKindVariable = { fg = theme.base0E },
-   CmpItemKindSnippet = { fg = base_30.red },
-   CmpItemKindText = { fg = theme.base0B },
-   CmpItemKindStructure = { fg = theme.base0E },
-   CmpItemKindType = { fg = theme.base0A },
-   CmpItemKindKeyword = { fg = theme.base07 },
-   CmpItemKindMethod = { fg = theme.base0D },
-   CmpItemKindConstructor = { fg = base_30.blue },
-   CmpItemKindFolder = { fg = theme.base07 },
-   CmpItemKindModule = { fg = theme.base0A },
-   CmpItemKindProperty = { fg = theme.base08 },
+   -- nvim cmp
+   CmpItemAbbr = { fg = colors.white },
+   CmpItemAbbrMatch = { fg = colors.blue, bold = true },
+   CmpBorder = { fg = colors.grey },
+   CmpDocBorder = { fg = colors.grey },
+
+   -- cmp item kinds
+   CmpItemKindConstant = { fg = base16.base09 },
+   CmpItemKindFunction = { fg = base16.base0D },
+   CmpItemKindIdentifier = { fg = base16.base08 },
+   CmpItemKindField = { fg = base16.base08 },
+   CmpItemKindVariable = { fg = base16.base0E },
+   CmpItemKindSnippet = { fg = colors.red },
+   CmpItemKindText = { fg = base16.base0B },
+   CmpItemKindStructure = { fg = base16.base0E },
+   CmpItemKindType = { fg = base16.base0A },
+   CmpItemKindKeyword = { fg = base16.base07 },
+   CmpItemKindMethod = { fg = base16.base0D },
+   CmpItemKindConstructor = { fg = colors.blue },
+   CmpItemKindFolder = { fg = base16.base07 },
+   CmpItemKindModule = { fg = base16.base0A },
+   CmpItemKindProperty = { fg = base16.base08 },
    -- CmpItemKindEnum = { fg = "" },
-   CmpItemKindUnit = { fg = theme.base0E },
+   CmpItemKindUnit = { fg = base16.base0E },
    -- CmpItemKindClass = { fg = "" },
-   CmpItemKindFile = { fg = theme.base07 },
+   CmpItemKindFile = { fg = base16.base07 },
    -- CmpItemKindInterface = { fg = "" },
-   CmpItemKindColor = { fg = base_30.red },
-   CmpItemKindReference = { fg = theme.base05 },
+   CmpItemKindColor = { fg = colors.red },
+   CmpItemKindReference = { fg = base16.base05 },
    -- CmpItemKindEnumMember = { fg = "" },
-   CmpItemKindStruct = { fg = theme.base0E },
+   CmpItemKindStruct = { fg = base16.base0E },
    -- CmpItemKindValue = { fg = "" },
    -- CmpItemKindEvent = { fg = "" },
-   CmpItemKindOperator = { fg = theme.base05 },
-   CmpItemKindTypeParameter = { fg = theme.base08 },
+   CmpItemKindOperator = { fg = base16.base05 },
+   CmpItemKindTypeParameter = { fg = base16.base08 },
 }
diff --git a/lua/integrations/nvchad.lua b/lua/integrations/nvchad.lua
index 6cc6802..a163967 100644
--- a/lua/integrations/nvchad.lua
+++ b/lua/integrations/nvchad.lua
@@ -42,12 +42,6 @@ local defaults = {
    PmenuSel = { bg = pmenu_bg, fg = black },
    PmenuThumb = { bg = grey },
 
-   -- nvim cmp
-   CmpItemAbbr = { fg = white },
-   CmpItemAbbrMatch = { fg = blue, bold = true },
-   CmpBorder = { fg = grey },
-   CmpDocBorder = { fg = grey },
-
    NvimInternalError = { fg = red },
    WinSeparator = { fg = one_bg2 },
 
@@ -94,71 +88,13 @@ local defaults = {
    DiagnosticWarn = { fg = yellow },
    DiagnosticInformation = { fg = green },
 
-   -- NvimTree
-   NvimTreeEmptyFolderName = { fg = folder_bg },
-   NvimTreeEndOfBuffer = { fg = darker_black },
-   NvimTreeFolderIcon = { fg = folder_bg },
-   NvimTreeFolderName = { fg = folder_bg },
-   NvimTreeGitDirty = { fg = red },
-   NvimTreeIndentMarker = { fg = grey_fg },
-   NvimTreeNormal = { bg = darker_black },
-   NvimTreeNormalNC = { bg = darker_black },
-   NvimTreeOpenedFolderName = { fg = folder_bg },
-   NvimTreeGitIgnored = { fg = light_grey },
-
-   NvimTreeWinSeparator = {
-      fg = darker_black,
-      bg = darker_black,
-   },
-
-   NvimTreeWindowPicker = {
-      fg = red,
-      bg = black2,
-   },
-
-   NvimTreeCursorLine = {
-      bg = black2,
-   },
-
-   -- Telescope
-   TelescopeBorder = {
-      fg = darker_black,
-      bg = darker_black,
-   },
-
-   TelescopePromptBorder = {
-      fg = black2,
-      bg = black2,
-   },
-
-   TelescopePromptNormal = {
-      fg = white,
-      bg = black2,
-   },
-
-   TelescopePromptPrefix = {
-      fg = red,
-      bg = black2,
-   },
-
-   TelescopeNormal = { bg = darker_black },
-
-   TelescopePreviewTitle = {
-      fg = black,
-      bg = green,
-   },
-
-   TelescopePromptTitle = {
-      fg = black,
-      bg = red,
-   },
-
-   TelescopeResultsTitle = {
-      fg = darker_black,
-      bg = darker_black,
-   },
+   -- whichkey
 
-   TelescopeSelection = { bg = black2 },
+   WhichKey = { fg = blue },
+   WhichKeySeparator = { fg = light_grey },
+   WhichKeyDesc = { fg = red },
+   WhichKeyGroup = { fg = green },
+   WhichKeyValue = { fg = green },
 }
 
 if ui.transparency then
diff --git a/lua/integrations/nvimtree.lua b/lua/integrations/nvimtree.lua
new file mode 100644
index 0000000..38fb835
--- /dev/null
+++ b/lua/integrations/nvimtree.lua
@@ -0,0 +1,28 @@
+local colors = require("base46").get_colors "base_30"
+
+return {
+   NvimTreeEmptyFolderName = { fg = colors.folder_bg },
+   NvimTreeEndOfBuffer = { fg = colors.darker_black },
+   NvimTreeFolderIcon = { fg = colors.folder_bg },
+   NvimTreeFolderName = { fg = colors.folder_bg },
+   NvimTreeGitDirty = { fg = colors.red },
+   NvimTreeIndentMarker = { fg = colors.grey_fg },
+   NvimTreeNormal = { bg = colors.darker_black },
+   NvimTreeNormalNC = { bg = colors.darker_black },
+   NvimTreeOpenedFolderName = { fg = colors.folder_bg },
+   NvimTreeGitIgnored = { fg = colors.light_grey },
+
+   NvimTreeWinSeparator = {
+      fg = colors.darker_black,
+      bg = colors.darker_black,
+   },
+
+   NvimTreeWindowPicker = {
+      fg = colors.red,
+      bg = colors.black2,
+   },
+
+   NvimTreeCursorLine = {
+      bg = colors.black2,
+   },
+}
diff --git a/lua/integrations/telescope.lua b/lua/integrations/telescope.lua
new file mode 100644
index 0000000..5466061
--- /dev/null
+++ b/lua/integrations/telescope.lua
@@ -0,0 +1,43 @@
+local colors = require("base46").get_colors "base_30"
+
+return {
+
+   TelescopeBorder = {
+      fg = colors.darker_black,
+      bg = colors.darker_black,
+   },
+
+   TelescopePromptBorder = {
+      fg = colors.black2,
+      bg = colors.black2,
+   },
+
+   TelescopePromptNormal = {
+      fg = colors.white,
+      bg = colors.black2,
+   },
+
+   TelescopePromptPrefix = {
+      fg = colors.red,
+      bg = colors.black2,
+   },
+
+   TelescopeNormal = { bg = colors.darker_black },
+
+   TelescopePreviewTitle = {
+      fg = colors.black,
+      bg = colors.green,
+   },
+
+   TelescopePromptTitle = {
+      fg = colors.black,
+      bg = colors.red,
+   },
+
+   TelescopeResultsTitle = {
+      fg = colors.darker_black,
+      bg = colors.darker_black,
+   },
+
+   TelescopeSelection = { bg = colors.black2 },
+}