From a7de377d8d3087581958f84d982b616fc93ca471 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Sat, 12 Nov 2022 17:01:26 +0100
Subject: Rename module

---
 lua/no-clown-fiesta/groups/alpha.lua               |  10 ++
 lua/no-clown-fiesta/groups/git.lua                 |  14 +++
 lua/no-clown-fiesta/groups/highlights.lua          | 127 +++++++++++++++++++++
 lua/no-clown-fiesta/groups/hop.lua                 |  12 ++
 lua/no-clown-fiesta/groups/lir.lua                 |  12 ++
 lua/no-clown-fiesta/groups/lsp.lua                 |  29 +++++
 lua/no-clown-fiesta/groups/markdown.lua            |  31 +++++
 lua/no-clown-fiesta/groups/neogit.lua              |  24 ++++
 lua/no-clown-fiesta/groups/nvim-cmp.lua            |  14 +++
 lua/no-clown-fiesta/groups/nvim-tree.lua           |  38 ++++++
 lua/no-clown-fiesta/groups/statusline.lua          |  13 +++
 lua/no-clown-fiesta/groups/telescope.lua           |  12 ++
 lua/no-clown-fiesta/groups/treesitter.lua          |  82 +++++++++++++
 lua/no-clown-fiesta/groups/whichkey.lua            |  13 +++
 lua/no-clown-fiesta/highlight-group/alpha.lua      |  10 --
 lua/no-clown-fiesta/highlight-group/git.lua        |  14 ---
 lua/no-clown-fiesta/highlight-group/hop.lua        |  12 --
 lua/no-clown-fiesta/highlight-group/lir.lua        |  12 --
 lua/no-clown-fiesta/highlight-group/lsp.lua        |  29 -----
 lua/no-clown-fiesta/highlight-group/markdown.lua   |  31 -----
 lua/no-clown-fiesta/highlight-group/neogit.lua     |  24 ----
 lua/no-clown-fiesta/highlight-group/nvim-cmp.lua   |  14 ---
 lua/no-clown-fiesta/highlight-group/nvim-tree.lua  |  38 ------
 lua/no-clown-fiesta/highlight-group/statusline.lua |  13 ---
 lua/no-clown-fiesta/highlight-group/telescope.lua  |  12 --
 lua/no-clown-fiesta/highlight-group/treesitter.lua |  82 -------------
 lua/no-clown-fiesta/highlight-group/whichkey.lua   |  13 ---
 lua/no-clown-fiesta/highlights.lua                 | 127 ---------------------
 lua/no-clown-fiesta/init.lua                       |  41 +++----
 29 files changed, 448 insertions(+), 455 deletions(-)
 create mode 100644 lua/no-clown-fiesta/groups/alpha.lua
 create mode 100644 lua/no-clown-fiesta/groups/git.lua
 create mode 100644 lua/no-clown-fiesta/groups/highlights.lua
 create mode 100644 lua/no-clown-fiesta/groups/hop.lua
 create mode 100644 lua/no-clown-fiesta/groups/lir.lua
 create mode 100644 lua/no-clown-fiesta/groups/lsp.lua
 create mode 100644 lua/no-clown-fiesta/groups/markdown.lua
 create mode 100644 lua/no-clown-fiesta/groups/neogit.lua
 create mode 100644 lua/no-clown-fiesta/groups/nvim-cmp.lua
 create mode 100644 lua/no-clown-fiesta/groups/nvim-tree.lua
 create mode 100644 lua/no-clown-fiesta/groups/statusline.lua
 create mode 100644 lua/no-clown-fiesta/groups/telescope.lua
 create mode 100644 lua/no-clown-fiesta/groups/treesitter.lua
 create mode 100644 lua/no-clown-fiesta/groups/whichkey.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/alpha.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/git.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/hop.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/lir.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/lsp.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/markdown.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/neogit.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/nvim-cmp.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/nvim-tree.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/statusline.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/telescope.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/treesitter.lua
 delete mode 100644 lua/no-clown-fiesta/highlight-group/whichkey.lua
 delete mode 100644 lua/no-clown-fiesta/highlights.lua

(limited to 'lua/no-clown-fiesta')

diff --git a/lua/no-clown-fiesta/groups/alpha.lua b/lua/no-clown-fiesta/groups/alpha.lua
new file mode 100644
index 0000000..167019a
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/alpha.lua
@@ -0,0 +1,10 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    AlphaHeader = { fg = palette.gray_blue },
+    AlphaButtons = { fg = palette.medium_gray },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/git.lua b/lua/no-clown-fiesta/groups/git.lua
new file mode 100644
index 0000000..4c71de3
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/git.lua
@@ -0,0 +1,14 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    SignAdd = { fg = palette.sign_add },
+    SignChange = { fg = palette.sign_change },
+    SignDelete = { fg = palette.sign_delete },
+    GitSignsAdd = { fg = palette.sign_add },
+    GitSignsChange = { fg = palette.sign_change },
+    GitSignsDelete = { fg = palette.sign_delete },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/highlights.lua b/lua/no-clown-fiesta/groups/highlights.lua
new file mode 100644
index 0000000..844b56b
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/highlights.lua
@@ -0,0 +1,127 @@
+local M = {}
+
+function M.highlight(palette, options)
+  return {
+    Normal = {
+      fg = palette.fg,
+      bg = options.transparent and palette.none or palette.bg,
+    },
+    SignColumn = { bg = palette.bg },
+    MsgArea = { fg = palette.fg, bg = palette.bg },
+    ModeMsg = { fg = palette.fg, bg = palette.bg },
+    MsgSeparator = { fg = palette.fg, bg = palette.bg },
+    SpellBad = { sp = palette.error, undercurl = true },
+    SpellCap = { sp = palette.yellow, undercurl = true },
+    SpellLocal = { sp = palette.green, undercurl = true },
+    SpellRare = { sp = palette.purple, undercurl = true },
+    NormalNC = { fg = palette.fg, bg = palette.bg },
+    Pmenu = { fg = palette.light_gray, bg = palette.accent },
+    PmenuSel = { fg = palette.blue, bg = palette.alt_bg },
+    WildMenu = { fg = palette.blue, bg = palette.alt_bg },
+    CursorLineNr = { fg = palette.light_gray, bold = true },
+    Comment = vim.tbl_extend(
+      "force",
+      { fg = palette.medium_gray },
+      options.styles.comments
+    ),
+    Folded = { fg = palette.light_gray, bg = palette.alt_bg },
+    FoldColumn = { fg = palette.light_gray, bg = palette.alt_bg },
+    LineNr = { fg = palette.gray },
+    FloatBoder = { fg = palette.gray, bg = palette.alt_bg },
+    Whitespace = { fg = palette.gray },
+    VertSplit = { fg = palette.bg, bg = palette.accent },
+    CursorLine = { bg = palette.alt_bg },
+    CursorColumn = { bg = palette.alt_bg },
+    ColorColumn = { bg = palette.alt_bg },
+    NormalFloat = { bg = palette.alt_bg },
+    Visual = { bg = palette.gray },
+    VisualNOS = { bg = palette.alt_bg },
+    WarningMsg = { fg = palette.error, bg = palette.bg },
+    DiffAdd = { bg = palette.neogit_green },
+    DiffText = { bg = palette.neogit_blue },
+    DiffChange = {
+      bg = palette.neogit_blue,
+    },
+    DiffDelete = { fg = palette.bg, bg = palette.neogit_red },
+    QuickFixLine = { bg = palette.accent },
+    PmenuSbar = { bg = palette.alt_bg },
+    PmenuThumb = { bg = palette.light_gray },
+    MatchWord = { underline = true },
+    MatchParen = { fg = palette.pale_purple, bg = palette.bg, underline = true },
+    MatchWordCur = { underline = true },
+    MatchParenCur = { underline = true },
+    Cursor = { fg = palette.cursor_fg, bg = palette.cursor_bg },
+    lCursor = { fg = palette.cursor_fg, bg = palette.cursor_bg },
+    CursorIM = { fg = palette.cursor_fg, bg = palette.cursor_bg },
+    TermCursor = { fg = palette.cursor_fg, bg = palette.cursor_bg },
+    TermCursorNC = { fg = palette.cursor_fg, bg = palette.cursor_bg },
+    Conceal = { fg = palette.accent },
+    Directory = { fg = palette.blue },
+    SpecialKey = { fg = palette.blue },
+    Title = { fg = palette.blue },
+    ErrorMsg = { fg = palette.error, bg = palette.bg, bold = true },
+    Search = { fg = palette.orange, bg = palette.alt_bg },
+    IncSearch = { fg = palette.cursor_fg, bg = palette.alt_bg },
+    Substitute = { fg = palette.alt_bg, bg = palette.gray_blue },
+    MoreMsg = { fg = palette.cyan },
+    Question = { fg = palette.cyan },
+    EndOfBuffer = { fg = palette.bg },
+    NonText = { fg = palette.bg },
+    Variable = vim.tbl_extend(
+      "force",
+      { fg = palette.white },
+      options.styles.variables
+    ),
+    String = { fg = palette.medium_gray_blue },
+    Character = { fg = palette.light_green },
+    Constant = { fg = palette.white },
+    Number = { fg = palette.red },
+    Boolean = { fg = palette.red },
+    Float = { fg = palette.red },
+    Identifier = { fg = palette.white },
+    Function = vim.tbl_extend("force", { fg = palette.cyan }, options.styles.functions),
+    Operator = { fg = palette.white },
+    Type = vim.tbl_extend("force", { fg = palette.white }, options.styles.type),
+    StorageClass = { fg = palette.gray_blue },
+    Structure = { fg = palette.gray_blue },
+    Typedef = { fg = palette.white },
+    Keyword = vim.tbl_extend(
+      "force",
+      { fg = palette.gray_blue },
+      options.styles.keywords
+    ),
+    Statement = { fg = palette.gray_blue },
+    Conditional = { fg = palette.gray_blue },
+    Repeat = { fg = palette.gray_blue },
+    Label = { fg = palette.white },
+    Exception = { fg = palette.red },
+    Include = { fg = palette.red },
+    PreProc = { fg = palette.white },
+    Define = { fg = palette.red },
+    Macro = { fg = palette.cyan },
+    PreCondit = { fg = palette.medium_gray },
+    Special = { fg = palette.white },
+    SpecialChar = { fg = palette.medium_gray_blue },
+    Tag = { fg = palette.pale_purple },
+    Debug = { fg = palette.red },
+    Delimiter = { fg = palette.white },
+    SpecialComment = vim.tbl_extend(
+      "force",
+      { fg = palette.medium_gray },
+      options.styles.comments
+    ),
+    Underlined = { underline = true },
+    Bold = { bold = true },
+    Italic = { italic = true },
+    Ignore = { fg = palette.cyan, bg = palette.bg, bold = true },
+    Todo = { fg = palette.red, bg = palette.bg, bold = true },
+    Error = { fg = palette.error, bg = palette.bg, bold = true },
+    TabLine = { fg = palette.gray, bg = palette.alt_bg },
+    TabLineSel = { fg = palette.white, bg = palette.alt_bg },
+    TabLineFill = { fg = palette.white, bg = palette.alt_bg },
+    WinSeparator = { fg = palette.medium_gray, bg = palette.bg },
+    DiagnosticFloatingError = { fg = palette.error },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/hop.lua b/lua/no-clown-fiesta/groups/hop.lua
new file mode 100644
index 0000000..caa16b2
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/hop.lua
@@ -0,0 +1,12 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    HopNextKey = { fg = palette.cyan, bold = true },
+    HopNextKey1 = { fg = palette.red, bold = true },
+    HopNextKey2 = { fg = palette.gray_blue },
+    HopUnmatched = { fg = palette.gray },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/lir.lua b/lua/no-clown-fiesta/groups/lir.lua
new file mode 100644
index 0000000..47071b7
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/lir.lua
@@ -0,0 +1,12 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    LirFloatNormal = { fg = palette.fg, bg = palette.alt_bg },
+    LirDir = { fg = palette.white },
+    LirSymLink = { fg = palette.cyan },
+    LirEmptyDirText = { fg = palette.medium_gray },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/lsp.lua b/lua/no-clown-fiesta/groups/lsp.lua
new file mode 100644
index 0000000..face8d3
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/lsp.lua
@@ -0,0 +1,29 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    LspReferenceRead = { bg = "#36383F" },
+    LspReferenceText = { bg = "#36383F" },
+    LspReferenceWrite = { bg = "#36383f" },
+
+    DiagnosticError = { fg = palette.error },
+    DiagnosticWarn = { fg = palette.warning },
+    DiagnosticInfo = { fg = palette.info },
+    DiagnosticHint = { fg = palette.hint },
+
+    DiagnosticVirtualTextError = { fg = palette.error },
+    DiagnosticVirtualTextWarn = { fg = palette.warning },
+    DiagnosticVirtualTextInfo = { fg = palette.info },
+    DiagnosticVirtualTextHint = { fg = palette.hint },
+
+    DiagnosticUnderlineError = { undercurl = true, sp = palette.error },
+    DiagnosticUnderlineWarn = { undercurl = true, sp = palette.warning },
+    DiagnosticUnderlineInfo = { undercurl = true, sp = palette.info },
+    DiagnosticUnderlineHint = { undercurl = true, sp = palette.hint },
+
+    LspSignatureActiveParameter = { bg = palette.alt_bg, bold = true },
+    LspCodeLens = { fg = palette.comment },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/markdown.lua b/lua/no-clown-fiesta/groups/markdown.lua
new file mode 100644
index 0000000..6147a25
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/markdown.lua
@@ -0,0 +1,31 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    markdownBlockquote = { fg = palette.accent },
+    markdownBold = { fg = palette.yellow, bold = true },
+    markdownCode = { fg = palette.green },
+    markdownCodeBlock = { fg = palette.green },
+    markdownCodeDelimiter = { fg = palette.green },
+    markdownH1 = { fg = palette.blue },
+    markdownH2 = { fg = palette.blue },
+    markdownH3 = { fg = palette.blue },
+    markdownH4 = { fg = palette.blue },
+    markdownH5 = { fg = palette.blue },
+    markdownH6 = { fg = palette.blue },
+    markdownHeadingDelimiter = { fg = palette.red },
+    markdownHeadingRule = { fg = palette.accent },
+    markdownId = { fg = palette.purple },
+    markdownIdDeclaration = { fg = palette.blue },
+    markdownIdDelimiter = { fg = palette.light_gray },
+    markdownLinkDelimiter = { fg = palette.light_gray },
+    markdownItalic = { italic = true },
+    markdownLinkText = { fg = palette.blue },
+    markdownListMarker = { fg = palette.red },
+    markdownOrderedListMarker = { fg = palette.red },
+    markdownRule = { fg = palette.accent },
+    markdownUrl = { fg = palette.cyan, underline = true },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/neogit.lua b/lua/no-clown-fiesta/groups/neogit.lua
new file mode 100644
index 0000000..14d9fb1
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/neogit.lua
@@ -0,0 +1,24 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    NeogitNotificationInfo = { fg = palette.sign_add },
+    NeogitNotificationWarning = { fg = palette.warning },
+    NeogitNotificationError = { fg = palette.sign_delete },
+    NeogitDiffAddHighlight = {
+      fg = palette.sign_add,
+      bg = palette.neogit_light_green,
+    },
+    NeogitDiffDeleteHighlight = {
+      fg = palette.sign_delete,
+      bg = palette.neogit_light_red,
+    },
+    NeogitDiffpaletteontextHighlight = { fg = palette.fg, bg = palette.accent },
+    NeogitHunkHeader = { fg = palette.fg, bg = palette.alt_bg },
+    NeogitHunkHeaderHighlight = { fg = palette.fg, bg = palette.gray },
+    NeogitDiffAdd = { fg = palette.sign_add, bg = palette.neogit_green },
+    NeogitDiffDelete = { fg = palette.sign_delete, bg = palette.neogit_red },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/nvim-cmp.lua b/lua/no-clown-fiesta/groups/nvim-cmp.lua
new file mode 100644
index 0000000..364af5b
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/nvim-cmp.lua
@@ -0,0 +1,14 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    CmpItemAbbr = { fg = palette.fg },
+    CmpItemAbbrDeprecated = { fg = palette.red },
+    CmpItemAbbrMatch = { fg = palette.orange },
+    CmpItemAbbrMatchFuzzy = { fg = palette.orange },
+    CmpItemMenu = { fg = palette.medium_gray },
+    CmpItemKind = { fg = palette.light_gray },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/nvim-tree.lua b/lua/no-clown-fiesta/groups/nvim-tree.lua
new file mode 100644
index 0000000..c110435
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/nvim-tree.lua
@@ -0,0 +1,38 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    NvimTreeFolderIcon = { fg = palette.white },
+    NvimTreeIndentMarker = { fg = palette.alt_bg },
+    NvimTreeNormal = { fg = palette.light_gray, bg = palette.alt_bg },
+    NvimTreeVertSplit = { fg = palette.alt_bg, bg = palette.alt_bg },
+    NvimTreeFolderName = { fg = palette.white },
+    NvimTreeOpenedFolderName = { fg = palette.white, bold = true },
+    NvimTreeEmptyFolderName = { fg = palette.medium_gray },
+    NvimTreeGitIgnored = { fg = palette.medium_gray },
+    NvimTreeImageFile = { fg = palette.light_gray },
+    NvimTreeSpecialFile = { fg = palette.orange },
+    NvimTreeEndOfBuffer = { fg = palette.alt_bg },
+    NvimTreeCursorLine = { bg = palette.accent },
+    NvimTreeGitignoreIcon = { fg = palette.red },
+    NvimTreeGitStaged = { fg = palette.cyan },
+    NvimTreeGitNew = { fg = palette.cyan },
+    NvimTreeGitRenamed = { fg = palette.cyan },
+    NvimTreeGitDeleted = { fg = palette.sign_delete },
+    NvimTreeGitMerge = { fg = palette.info },
+    NvimTreeGitDirty = { fg = palette.info },
+    NvimTreeSymlink = { fg = palette.cyan },
+    NvimTreeRootFolder = { fg = palette.fg, bold = true },
+    NvimTreeExecFile = { fg = palette.green },
+    NvimTreeStatusLine = { fg = palette.alt_bg, bg = palette.alt_bg },
+    NvimTreeStatusLineNC = { fg = palette.alt_bg, bg = palette.alt_bg },
+    NvimTreeStatusNC = { fg = palette.alt_bg, bg = palette.alt_bg },
+    NvimTreeLspDiagnosticsErr = { fg = palette.error },
+    NvimTreeLspDiagnosticsError = { fg = palette.error },
+    NvimTreeLspDiagnosticsHint = { fg = palette.hint },
+    NvimTreeLspDiagnosticsInformation = { fg = palette.info },
+    NvimTreeLspDiagnosticsWarning = { fg = palette.warning },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/statusline.lua b/lua/no-clown-fiesta/groups/statusline.lua
new file mode 100644
index 0000000..ede108a
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/statusline.lua
@@ -0,0 +1,13 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    StatusLine = { fg = palette.gray, bg = palette.bg },
+    StatusLineNC = { fg = palette.alt_bg, bg = palette.alt_bg },
+    StatusLineSeparator = { fg = palette.bg },
+    StatusLineTerm = { fg = palette.bg },
+    StatusLineTermNC = { fg = palette.bg },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/telescope.lua b/lua/no-clown-fiesta/groups/telescope.lua
new file mode 100644
index 0000000..24e573c
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/telescope.lua
@@ -0,0 +1,12 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    TelescopeNormal = { fg = palette.fg, bg = palette.bg },
+    TelescopeSelection = { fg = palette.fg, bg = palette.accent },
+    TelescopeMatching = { fg = palette.info, bold = true },
+    TelescopeBorder = { fg = palette.fg, bg = palette.bg },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/treesitter.lua b/lua/no-clown-fiesta/groups/treesitter.lua
new file mode 100644
index 0000000..6217cb7
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/treesitter.lua
@@ -0,0 +1,82 @@
+local M = {}
+
+local unpack = unpack
+
+function M.highlight(palette, options)
+  return {
+    ["@comment"] = vim.tbl_extend(
+      "force",
+      { fg = palette.medium_gray },
+      options.styles.comments
+    ),
+    ["@annotation"] = { fg = palette.white },
+    ["@attribute"] = { fg = palette.white },
+    ["@constructor"] = { fg = palette.cyan },
+    ["@type"] = vim.tbl_extend("force", { fg = palette.white }, options.styles.type),
+    ["@type.builtin"] = { fg = palette.white },
+    ["@conditional"] = { fg = palette.gray_blue },
+    ["@exception"] = { fg = palette.red },
+    ["@include"] = { fg = palette.red },
+    ["@keyword"] = vim.tbl_extend(
+      "force",
+      { fg = palette.gray_blue },
+      options.styles.keywords
+    ),
+    ["@keyword.function"] = vim.tbl_extend(
+      "force",
+      { fg = palette.gray_blue },
+      options.styles.keywords
+    ),
+    ["@label"] = { fg = palette.white },
+    ["@namespace"] = { fg = palette.white },
+    ["@repeat"] = { fg = palette.gray_blue },
+    ["@constant"] = { fg = palette.white },
+    ["@const.builtin"] = { fg = palette.red },
+    ["@float"] = { fg = palette.red },
+    ["@number"] = { fg = palette.red },
+    ["@boolean"] = { fg = palette.red },
+    ["@character"] = { fg = palette.light_green },
+    ["@error"] = { fg = palette.error },
+    ["@function"] = vim.tbl_extend(
+      "force",
+      { fg = palette.cyan },
+      options.styles.functions
+    ),
+    ["@function.builtin"] = { fg = palette.cyan },
+    ["@method"] = { fg = palette.cyan },
+    ["@const.macro"] = { fg = palette.cyan },
+    ["@function.macro"] = { fg = palette.cyan },
+    ["@variable"] = vim.tbl_extend(
+      "force",
+      { fg = palette.white },
+      options.styles.variables
+    ),
+    ["@variable.builtin"] = { fg = palette.white },
+    ["@property"] = { fg = palette.white },
+    ["@operator"] = { fg = palette.white },
+    ["@field"] = { fg = palette.white },
+    ["@parameter"] = { fg = palette.white },
+    ["@parameter.reference"] = { fg = palette.white },
+    ["@symbol"] = { fg = palette.medium_gray },
+    ["@text"] = { fg = palette.fg },
+    ["@punctuation.delimiter"] = { fg = palette.white },
+    ["@tag.delimiter"] = { fg = palette.white },
+    ["@punctuation.bracket"] = { fg = palette.white },
+    ["@punctuation.special"] = { fg = palette.medium_gray },
+    ["@string"] = { fg = palette.medium_gray_blue },
+    ["@string.regex"] = { fg = palette.medium_gray_blue },
+    ["@string.escape"] = { fg = palette.medium_gray_blue },
+    ["@tag"] = { fg = palette.pale_purple },
+    ["@emphasis"] = { italic = true },
+    ["@underline"] = { underline = true },
+    ["@title"] = { fg = palette.medium_gray },
+    ["@literal"] = { fg = palette.medium_gray },
+    ["@uri"] = { fg = palette.cyan, underline = true },
+    ["@keyword.operator"] = { fg = palette.gray_blue },
+    ["@structure"] = { fg = palette.purple_test },
+    ["@strong"] = { fg = palette.medium_gray },
+    ["@query.linter.error"] = { fg = palette.warning },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/groups/whichkey.lua b/lua/no-clown-fiesta/groups/whichkey.lua
new file mode 100644
index 0000000..66ac153
--- /dev/null
+++ b/lua/no-clown-fiesta/groups/whichkey.lua
@@ -0,0 +1,13 @@
+local M = {}
+
+function M.highlight(palette)
+  return {
+    WhichKey = { fg = palette.light_gray },
+    WhichKeySeperator = { fg = palette.gray },
+    WhichKeyGroup = { fg = palette.red },
+    WhichKeyDesc = { fg = palette.light_gray },
+    WhichKeyFloat = { bg = palette.bg },
+  }
+end
+
+return M
diff --git a/lua/no-clown-fiesta/highlight-group/alpha.lua b/lua/no-clown-fiesta/highlight-group/alpha.lua
deleted file mode 100644
index 167019a..0000000
--- a/lua/no-clown-fiesta/highlight-group/alpha.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    AlphaHeader = { fg = palette.gray_blue },
-    AlphaButtons = { fg = palette.medium_gray },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/git.lua b/lua/no-clown-fiesta/highlight-group/git.lua
deleted file mode 100644
index 4c71de3..0000000
--- a/lua/no-clown-fiesta/highlight-group/git.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    SignAdd = { fg = palette.sign_add },
-    SignChange = { fg = palette.sign_change },
-    SignDelete = { fg = palette.sign_delete },
-    GitSignsAdd = { fg = palette.sign_add },
-    GitSignsChange = { fg = palette.sign_change },
-    GitSignsDelete = { fg = palette.sign_delete },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/hop.lua b/lua/no-clown-fiesta/highlight-group/hop.lua
deleted file mode 100644
index caa16b2..0000000
--- a/lua/no-clown-fiesta/highlight-group/hop.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    HopNextKey = { fg = palette.cyan, bold = true },
-    HopNextKey1 = { fg = palette.red, bold = true },
-    HopNextKey2 = { fg = palette.gray_blue },
-    HopUnmatched = { fg = palette.gray },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/lir.lua b/lua/no-clown-fiesta/highlight-group/lir.lua
deleted file mode 100644
index 47071b7..0000000
--- a/lua/no-clown-fiesta/highlight-group/lir.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    LirFloatNormal = { fg = palette.fg, bg = palette.alt_bg },
-    LirDir = { fg = palette.white },
-    LirSymLink = { fg = palette.cyan },
-    LirEmptyDirText = { fg = palette.medium_gray },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/lsp.lua b/lua/no-clown-fiesta/highlight-group/lsp.lua
deleted file mode 100644
index face8d3..0000000
--- a/lua/no-clown-fiesta/highlight-group/lsp.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    LspReferenceRead = { bg = "#36383F" },
-    LspReferenceText = { bg = "#36383F" },
-    LspReferenceWrite = { bg = "#36383f" },
-
-    DiagnosticError = { fg = palette.error },
-    DiagnosticWarn = { fg = palette.warning },
-    DiagnosticInfo = { fg = palette.info },
-    DiagnosticHint = { fg = palette.hint },
-
-    DiagnosticVirtualTextError = { fg = palette.error },
-    DiagnosticVirtualTextWarn = { fg = palette.warning },
-    DiagnosticVirtualTextInfo = { fg = palette.info },
-    DiagnosticVirtualTextHint = { fg = palette.hint },
-
-    DiagnosticUnderlineError = { undercurl = true, sp = palette.error },
-    DiagnosticUnderlineWarn = { undercurl = true, sp = palette.warning },
-    DiagnosticUnderlineInfo = { undercurl = true, sp = palette.info },
-    DiagnosticUnderlineHint = { undercurl = true, sp = palette.hint },
-
-    LspSignatureActiveParameter = { bg = palette.alt_bg, bold = true },
-    LspCodeLens = { fg = palette.comment },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/markdown.lua b/lua/no-clown-fiesta/highlight-group/markdown.lua
deleted file mode 100644
index 6147a25..0000000
--- a/lua/no-clown-fiesta/highlight-group/markdown.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    markdownBlockquote = { fg = palette.accent },
-    markdownBold = { fg = palette.yellow, bold = true },
-    markdownCode = { fg = palette.green },
-    markdownCodeBlock = { fg = palette.green },
-    markdownCodeDelimiter = { fg = palette.green },
-    markdownH1 = { fg = palette.blue },
-    markdownH2 = { fg = palette.blue },
-    markdownH3 = { fg = palette.blue },
-    markdownH4 = { fg = palette.blue },
-    markdownH5 = { fg = palette.blue },
-    markdownH6 = { fg = palette.blue },
-    markdownHeadingDelimiter = { fg = palette.red },
-    markdownHeadingRule = { fg = palette.accent },
-    markdownId = { fg = palette.purple },
-    markdownIdDeclaration = { fg = palette.blue },
-    markdownIdDelimiter = { fg = palette.light_gray },
-    markdownLinkDelimiter = { fg = palette.light_gray },
-    markdownItalic = { italic = true },
-    markdownLinkText = { fg = palette.blue },
-    markdownListMarker = { fg = palette.red },
-    markdownOrderedListMarker = { fg = palette.red },
-    markdownRule = { fg = palette.accent },
-    markdownUrl = { fg = palette.cyan, underline = true },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/neogit.lua b/lua/no-clown-fiesta/highlight-group/neogit.lua
deleted file mode 100644
index 14d9fb1..0000000
--- a/lua/no-clown-fiesta/highlight-group/neogit.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    NeogitNotificationInfo = { fg = palette.sign_add },
-    NeogitNotificationWarning = { fg = palette.warning },
-    NeogitNotificationError = { fg = palette.sign_delete },
-    NeogitDiffAddHighlight = {
-      fg = palette.sign_add,
-      bg = palette.neogit_light_green,
-    },
-    NeogitDiffDeleteHighlight = {
-      fg = palette.sign_delete,
-      bg = palette.neogit_light_red,
-    },
-    NeogitDiffpaletteontextHighlight = { fg = palette.fg, bg = palette.accent },
-    NeogitHunkHeader = { fg = palette.fg, bg = palette.alt_bg },
-    NeogitHunkHeaderHighlight = { fg = palette.fg, bg = palette.gray },
-    NeogitDiffAdd = { fg = palette.sign_add, bg = palette.neogit_green },
-    NeogitDiffDelete = { fg = palette.sign_delete, bg = palette.neogit_red },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/nvim-cmp.lua b/lua/no-clown-fiesta/highlight-group/nvim-cmp.lua
deleted file mode 100644
index 364af5b..0000000
--- a/lua/no-clown-fiesta/highlight-group/nvim-cmp.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    CmpItemAbbr = { fg = palette.fg },
-    CmpItemAbbrDeprecated = { fg = palette.red },
-    CmpItemAbbrMatch = { fg = palette.orange },
-    CmpItemAbbrMatchFuzzy = { fg = palette.orange },
-    CmpItemMenu = { fg = palette.medium_gray },
-    CmpItemKind = { fg = palette.light_gray },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/nvim-tree.lua b/lua/no-clown-fiesta/highlight-group/nvim-tree.lua
deleted file mode 100644
index c110435..0000000
--- a/lua/no-clown-fiesta/highlight-group/nvim-tree.lua
+++ /dev/null
@@ -1,38 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    NvimTreeFolderIcon = { fg = palette.white },
-    NvimTreeIndentMarker = { fg = palette.alt_bg },
-    NvimTreeNormal = { fg = palette.light_gray, bg = palette.alt_bg },
-    NvimTreeVertSplit = { fg = palette.alt_bg, bg = palette.alt_bg },
-    NvimTreeFolderName = { fg = palette.white },
-    NvimTreeOpenedFolderName = { fg = palette.white, bold = true },
-    NvimTreeEmptyFolderName = { fg = palette.medium_gray },
-    NvimTreeGitIgnored = { fg = palette.medium_gray },
-    NvimTreeImageFile = { fg = palette.light_gray },
-    NvimTreeSpecialFile = { fg = palette.orange },
-    NvimTreeEndOfBuffer = { fg = palette.alt_bg },
-    NvimTreeCursorLine = { bg = palette.accent },
-    NvimTreeGitignoreIcon = { fg = palette.red },
-    NvimTreeGitStaged = { fg = palette.cyan },
-    NvimTreeGitNew = { fg = palette.cyan },
-    NvimTreeGitRenamed = { fg = palette.cyan },
-    NvimTreeGitDeleted = { fg = palette.sign_delete },
-    NvimTreeGitMerge = { fg = palette.info },
-    NvimTreeGitDirty = { fg = palette.info },
-    NvimTreeSymlink = { fg = palette.cyan },
-    NvimTreeRootFolder = { fg = palette.fg, bold = true },
-    NvimTreeExecFile = { fg = palette.green },
-    NvimTreeStatusLine = { fg = palette.alt_bg, bg = palette.alt_bg },
-    NvimTreeStatusLineNC = { fg = palette.alt_bg, bg = palette.alt_bg },
-    NvimTreeStatusNC = { fg = palette.alt_bg, bg = palette.alt_bg },
-    NvimTreeLspDiagnosticsErr = { fg = palette.error },
-    NvimTreeLspDiagnosticsError = { fg = palette.error },
-    NvimTreeLspDiagnosticsHint = { fg = palette.hint },
-    NvimTreeLspDiagnosticsInformation = { fg = palette.info },
-    NvimTreeLspDiagnosticsWarning = { fg = palette.warning },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/statusline.lua b/lua/no-clown-fiesta/highlight-group/statusline.lua
deleted file mode 100644
index ede108a..0000000
--- a/lua/no-clown-fiesta/highlight-group/statusline.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    StatusLine = { fg = palette.gray, bg = palette.bg },
-    StatusLineNC = { fg = palette.alt_bg, bg = palette.alt_bg },
-    StatusLineSeparator = { fg = palette.bg },
-    StatusLineTerm = { fg = palette.bg },
-    StatusLineTermNC = { fg = palette.bg },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/telescope.lua b/lua/no-clown-fiesta/highlight-group/telescope.lua
deleted file mode 100644
index 24e573c..0000000
--- a/lua/no-clown-fiesta/highlight-group/telescope.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    TelescopeNormal = { fg = palette.fg, bg = palette.bg },
-    TelescopeSelection = { fg = palette.fg, bg = palette.accent },
-    TelescopeMatching = { fg = palette.info, bold = true },
-    TelescopeBorder = { fg = palette.fg, bg = palette.bg },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/treesitter.lua b/lua/no-clown-fiesta/highlight-group/treesitter.lua
deleted file mode 100644
index 6217cb7..0000000
--- a/lua/no-clown-fiesta/highlight-group/treesitter.lua
+++ /dev/null
@@ -1,82 +0,0 @@
-local M = {}
-
-local unpack = unpack
-
-function M.highlight(palette, options)
-  return {
-    ["@comment"] = vim.tbl_extend(
-      "force",
-      { fg = palette.medium_gray },
-      options.styles.comments
-    ),
-    ["@annotation"] = { fg = palette.white },
-    ["@attribute"] = { fg = palette.white },
-    ["@constructor"] = { fg = palette.cyan },
-    ["@type"] = vim.tbl_extend("force", { fg = palette.white }, options.styles.type),
-    ["@type.builtin"] = { fg = palette.white },
-    ["@conditional"] = { fg = palette.gray_blue },
-    ["@exception"] = { fg = palette.red },
-    ["@include"] = { fg = palette.red },
-    ["@keyword"] = vim.tbl_extend(
-      "force",
-      { fg = palette.gray_blue },
-      options.styles.keywords
-    ),
-    ["@keyword.function"] = vim.tbl_extend(
-      "force",
-      { fg = palette.gray_blue },
-      options.styles.keywords
-    ),
-    ["@label"] = { fg = palette.white },
-    ["@namespace"] = { fg = palette.white },
-    ["@repeat"] = { fg = palette.gray_blue },
-    ["@constant"] = { fg = palette.white },
-    ["@const.builtin"] = { fg = palette.red },
-    ["@float"] = { fg = palette.red },
-    ["@number"] = { fg = palette.red },
-    ["@boolean"] = { fg = palette.red },
-    ["@character"] = { fg = palette.light_green },
-    ["@error"] = { fg = palette.error },
-    ["@function"] = vim.tbl_extend(
-      "force",
-      { fg = palette.cyan },
-      options.styles.functions
-    ),
-    ["@function.builtin"] = { fg = palette.cyan },
-    ["@method"] = { fg = palette.cyan },
-    ["@const.macro"] = { fg = palette.cyan },
-    ["@function.macro"] = { fg = palette.cyan },
-    ["@variable"] = vim.tbl_extend(
-      "force",
-      { fg = palette.white },
-      options.styles.variables
-    ),
-    ["@variable.builtin"] = { fg = palette.white },
-    ["@property"] = { fg = palette.white },
-    ["@operator"] = { fg = palette.white },
-    ["@field"] = { fg = palette.white },
-    ["@parameter"] = { fg = palette.white },
-    ["@parameter.reference"] = { fg = palette.white },
-    ["@symbol"] = { fg = palette.medium_gray },
-    ["@text"] = { fg = palette.fg },
-    ["@punctuation.delimiter"] = { fg = palette.white },
-    ["@tag.delimiter"] = { fg = palette.white },
-    ["@punctuation.bracket"] = { fg = palette.white },
-    ["@punctuation.special"] = { fg = palette.medium_gray },
-    ["@string"] = { fg = palette.medium_gray_blue },
-    ["@string.regex"] = { fg = palette.medium_gray_blue },
-    ["@string.escape"] = { fg = palette.medium_gray_blue },
-    ["@tag"] = { fg = palette.pale_purple },
-    ["@emphasis"] = { italic = true },
-    ["@underline"] = { underline = true },
-    ["@title"] = { fg = palette.medium_gray },
-    ["@literal"] = { fg = palette.medium_gray },
-    ["@uri"] = { fg = palette.cyan, underline = true },
-    ["@keyword.operator"] = { fg = palette.gray_blue },
-    ["@structure"] = { fg = palette.purple_test },
-    ["@strong"] = { fg = palette.medium_gray },
-    ["@query.linter.error"] = { fg = palette.warning },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlight-group/whichkey.lua b/lua/no-clown-fiesta/highlight-group/whichkey.lua
deleted file mode 100644
index 66ac153..0000000
--- a/lua/no-clown-fiesta/highlight-group/whichkey.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local M = {}
-
-function M.highlight(palette)
-  return {
-    WhichKey = { fg = palette.light_gray },
-    WhichKeySeperator = { fg = palette.gray },
-    WhichKeyGroup = { fg = palette.red },
-    WhichKeyDesc = { fg = palette.light_gray },
-    WhichKeyFloat = { bg = palette.bg },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/highlights.lua b/lua/no-clown-fiesta/highlights.lua
deleted file mode 100644
index 844b56b..0000000
--- a/lua/no-clown-fiesta/highlights.lua
+++ /dev/null
@@ -1,127 +0,0 @@
-local M = {}
-
-function M.highlight(palette, options)
-  return {
-    Normal = {
-      fg = palette.fg,
-      bg = options.transparent and palette.none or palette.bg,
-    },
-    SignColumn = { bg = palette.bg },
-    MsgArea = { fg = palette.fg, bg = palette.bg },
-    ModeMsg = { fg = palette.fg, bg = palette.bg },
-    MsgSeparator = { fg = palette.fg, bg = palette.bg },
-    SpellBad = { sp = palette.error, undercurl = true },
-    SpellCap = { sp = palette.yellow, undercurl = true },
-    SpellLocal = { sp = palette.green, undercurl = true },
-    SpellRare = { sp = palette.purple, undercurl = true },
-    NormalNC = { fg = palette.fg, bg = palette.bg },
-    Pmenu = { fg = palette.light_gray, bg = palette.accent },
-    PmenuSel = { fg = palette.blue, bg = palette.alt_bg },
-    WildMenu = { fg = palette.blue, bg = palette.alt_bg },
-    CursorLineNr = { fg = palette.light_gray, bold = true },
-    Comment = vim.tbl_extend(
-      "force",
-      { fg = palette.medium_gray },
-      options.styles.comments
-    ),
-    Folded = { fg = palette.light_gray, bg = palette.alt_bg },
-    FoldColumn = { fg = palette.light_gray, bg = palette.alt_bg },
-    LineNr = { fg = palette.gray },
-    FloatBoder = { fg = palette.gray, bg = palette.alt_bg },
-    Whitespace = { fg = palette.gray },
-    VertSplit = { fg = palette.bg, bg = palette.accent },
-    CursorLine = { bg = palette.alt_bg },
-    CursorColumn = { bg = palette.alt_bg },
-    ColorColumn = { bg = palette.alt_bg },
-    NormalFloat = { bg = palette.alt_bg },
-    Visual = { bg = palette.gray },
-    VisualNOS = { bg = palette.alt_bg },
-    WarningMsg = { fg = palette.error, bg = palette.bg },
-    DiffAdd = { bg = palette.neogit_green },
-    DiffText = { bg = palette.neogit_blue },
-    DiffChange = {
-      bg = palette.neogit_blue,
-    },
-    DiffDelete = { fg = palette.bg, bg = palette.neogit_red },
-    QuickFixLine = { bg = palette.accent },
-    PmenuSbar = { bg = palette.alt_bg },
-    PmenuThumb = { bg = palette.light_gray },
-    MatchWord = { underline = true },
-    MatchParen = { fg = palette.pale_purple, bg = palette.bg, underline = true },
-    MatchWordCur = { underline = true },
-    MatchParenCur = { underline = true },
-    Cursor = { fg = palette.cursor_fg, bg = palette.cursor_bg },
-    lCursor = { fg = palette.cursor_fg, bg = palette.cursor_bg },
-    CursorIM = { fg = palette.cursor_fg, bg = palette.cursor_bg },
-    TermCursor = { fg = palette.cursor_fg, bg = palette.cursor_bg },
-    TermCursorNC = { fg = palette.cursor_fg, bg = palette.cursor_bg },
-    Conceal = { fg = palette.accent },
-    Directory = { fg = palette.blue },
-    SpecialKey = { fg = palette.blue },
-    Title = { fg = palette.blue },
-    ErrorMsg = { fg = palette.error, bg = palette.bg, bold = true },
-    Search = { fg = palette.orange, bg = palette.alt_bg },
-    IncSearch = { fg = palette.cursor_fg, bg = palette.alt_bg },
-    Substitute = { fg = palette.alt_bg, bg = palette.gray_blue },
-    MoreMsg = { fg = palette.cyan },
-    Question = { fg = palette.cyan },
-    EndOfBuffer = { fg = palette.bg },
-    NonText = { fg = palette.bg },
-    Variable = vim.tbl_extend(
-      "force",
-      { fg = palette.white },
-      options.styles.variables
-    ),
-    String = { fg = palette.medium_gray_blue },
-    Character = { fg = palette.light_green },
-    Constant = { fg = palette.white },
-    Number = { fg = palette.red },
-    Boolean = { fg = palette.red },
-    Float = { fg = palette.red },
-    Identifier = { fg = palette.white },
-    Function = vim.tbl_extend("force", { fg = palette.cyan }, options.styles.functions),
-    Operator = { fg = palette.white },
-    Type = vim.tbl_extend("force", { fg = palette.white }, options.styles.type),
-    StorageClass = { fg = palette.gray_blue },
-    Structure = { fg = palette.gray_blue },
-    Typedef = { fg = palette.white },
-    Keyword = vim.tbl_extend(
-      "force",
-      { fg = palette.gray_blue },
-      options.styles.keywords
-    ),
-    Statement = { fg = palette.gray_blue },
-    Conditional = { fg = palette.gray_blue },
-    Repeat = { fg = palette.gray_blue },
-    Label = { fg = palette.white },
-    Exception = { fg = palette.red },
-    Include = { fg = palette.red },
-    PreProc = { fg = palette.white },
-    Define = { fg = palette.red },
-    Macro = { fg = palette.cyan },
-    PreCondit = { fg = palette.medium_gray },
-    Special = { fg = palette.white },
-    SpecialChar = { fg = palette.medium_gray_blue },
-    Tag = { fg = palette.pale_purple },
-    Debug = { fg = palette.red },
-    Delimiter = { fg = palette.white },
-    SpecialComment = vim.tbl_extend(
-      "force",
-      { fg = palette.medium_gray },
-      options.styles.comments
-    ),
-    Underlined = { underline = true },
-    Bold = { bold = true },
-    Italic = { italic = true },
-    Ignore = { fg = palette.cyan, bg = palette.bg, bold = true },
-    Todo = { fg = palette.red, bg = palette.bg, bold = true },
-    Error = { fg = palette.error, bg = palette.bg, bold = true },
-    TabLine = { fg = palette.gray, bg = palette.alt_bg },
-    TabLineSel = { fg = palette.white, bg = palette.alt_bg },
-    TabLineFill = { fg = palette.white, bg = palette.alt_bg },
-    WinSeparator = { fg = palette.medium_gray, bg = palette.bg },
-    DiagnosticFloatingError = { fg = palette.error },
-  }
-end
-
-return M
diff --git a/lua/no-clown-fiesta/init.lua b/lua/no-clown-fiesta/init.lua
index 1cfc291..88733ea 100644
--- a/lua/no-clown-fiesta/init.lua
+++ b/lua/no-clown-fiesta/init.lua
@@ -22,34 +22,27 @@ function M.load()
 
   local util = require "no-clown-fiesta.util"
   local palette = require "no-clown-fiesta.palette"
-  local highlights = require("no-clown-fiesta.highlights").highlight(palette, options)
-
-  local alpha = require("no-clown-fiesta.highlight-group.alpha").highlight(palette)
-  local git = require("no-clown-fiesta.highlight-group.git").highlight(palette)
-  local hop = require("no-clown-fiesta.highlight-group.hop").highlight(palette)
-  local lir = require("no-clown-fiesta.highlight-group.lir").highlight(palette)
-  local lsp = require("no-clown-fiesta.highlight-group.lsp").highlight(palette)
-  local markdown = require("no-clown-fiesta.highlight-group.markdown").highlight(
-    palette
-  )
-  local neogit = require("no-clown-fiesta.highlight-group.neogit").highlight(palette)
-  local nvimtree = require("no-clown-fiesta.highlight-group.nvim-tree").highlight(
-    palette
-  )
-  local nvimcmp = require("no-clown-fiesta.highlight-group.nvim-cmp").highlight(palette)
-  local statusline = require("no-clown-fiesta.highlight-group.statusline").highlight(
-    palette
-  )
-  local telescope = require("no-clown-fiesta.highlight-group.telescope").highlight(
-    palette
-  )
-  local treesitter = require("no-clown-fiesta.highlight-group.treesitter").highlight(
+  local highlights = require("no-clown-fiesta.groups.highlights").highlight(
     palette,
     options
   )
-  local whichkey = require("no-clown-fiesta.highlight-group.whichkey").highlight(
-    palette
+
+  local alpha = require("no-clown-fiesta.groups.alpha").highlight(palette)
+  local git = require("no-clown-fiesta.groups.git").highlight(palette)
+  local hop = require("no-clown-fiesta.groups.hop").highlight(palette)
+  local lir = require("no-clown-fiesta.groups.lir").highlight(palette)
+  local lsp = require("no-clown-fiesta.groups.lsp").highlight(palette)
+  local markdown = require("no-clown-fiesta.groups.markdown").highlight(palette)
+  local neogit = require("no-clown-fiesta.groups.neogit").highlight(palette)
+  local nvimtree = require("no-clown-fiesta.groups.nvim-tree").highlight(palette)
+  local nvimcmp = require("no-clown-fiesta.groups.nvim-cmp").highlight(palette)
+  local statusline = require("no-clown-fiesta.groups.statusline").highlight(palette)
+  local telescope = require("no-clown-fiesta.groups.telescope").highlight(palette)
+  local treesitter = require("no-clown-fiesta.groups.treesitter").highlight(
+    palette,
+    options
   )
+  local whichkey = require("no-clown-fiesta.groups.whichkey").highlight(palette)
 
   local skeletons = {
     alpha,
-- 
cgit v1.2.3-70-g09d2