diff --git a/lua/one_monokai/highlights/groups.lua b/lua/one_monokai/highlights/groups.lua
deleted file mode 100644
index 2e0350b..0000000
--- a/lua/one_monokai/highlights/groups.lua
+++ /dev/null
@@ -1,778 +0,0 @@
----@class one_monokai.highlights.groups
----@field [string] vim.api.keyset.highlight
-local groups = {}
-
-local colors = require "one_monokai.colors"
-local config = require "one_monokai.config"
-
----@type one_monokai.highlights.groups
-local defaults = {
-    Boolean = { fg = colors.cyan },
-    Character = { fg = colors.yellow },
-    Constant = { fg = colors.aqua },
-    Float = { fg = colors.purple },
-    Number = { fg = colors.purple },
-    String = { fg = colors.yellow },
-
-    StorageClass = { fg = colors.cyan },
-    Structure = { fg = colors.cyan },
-    Type = { fg = colors.aqua },
-    Typedef = { fg = colors.aqua },
-
-    Function = { fg = colors.green },
-    Identifier = { fg = colors.green },
-
-    Keyword = { fg = colors.cyan },
-    Label = { fg = colors.pink },
-    Operator = { fg = colors.pink },
-    Statement = { fg = colors.pink },
-
-    Define = { fg = colors.pink },
-    Include = { fg = colors.pink },
-    Macro = { fg = colors.green },
-    PreCondit = { fg = colors.pink },
-    PreProc = { fg = colors.green },
-    Conceal = { fg = colors.light_gray },
-
-    Delimiter = { fg = colors.pink },
-    Special = { fg = colors.purple },
-    SpecialChar = { fg = colors.pink },
-    SpecialComment = { fg = colors.cyan },
-    Tag = { fg = colors.pink },
-
-    Comment = { fg = colors.gray, italic = config.italics },
-    Todo = { fg = colors.orange, bold = true, italic = config.italics },
-
-    Error = { fg = colors.red },
-    Ignore = { fg = colors.yellow },
-    Underlined = { fg = colors.green, underline = true },
-
-    ColorColumn = { bg = colors.dark_blue },
-    Cursor = { fg = colors.bg, bg = colors.fg },
-    CursorColumn = { bg = colors.vulcan },
-    CursorLine = { bg = colors.vulcan },
-    CursorLineNr = { fg = colors.fg },
-    ErrorMsg = { fg = colors.red },
-    FloatTitle = { fg = colors.pink },
-    LineNr = { fg = colors.dark_gray },
-    MatchParen = { bg = colors.dark_gray, bold = true },
-    ModeMsg = { fg = colors.yellow },
-    MoreMsg = { fg = colors.yellow },
-    Nontext = { fg = colors.dark_gray:lighten(0.8) },
-    Whitespace = { fg = colors.dark_gray:darken(0.91) },
-    Normal = { fg = colors.fg, bg = config.transparent and colors.none or colors.bg },
-    NormalFloat = { link = "Normal" },
-    WinBar = { link = "Normal" },
-    WinBarNC = { link = "NormalNC" },
-    Question = { fg = colors.yellow },
-    Search = { fg = colors.bg, bg = colors.yellow },
-    SignColumn = {},
-    StatusLine = { fg = colors.light_gray, bg = colors.black },
-    StatusLineNC = { fg = colors.light_gray, bg = colors.dark_blue },
-    TabLine = { fg = colors.fg, bg = config.transparent and colors.none or colors.dark_blue },
-    VertSplit = { fg = colors.fg },
-    Visual = { bg = colors.dark_gray },
-    WarningMsg = { fg = colors.yellow },
-
-    QuickFixLine = { bg = colors.vulcan },
-
-    Directory = { fg = colors.aqua },
-    SpecialKey = { fg = colors.pink },
-    Title = { fg = colors.yellow },
-
-    -- checkhealth
-    healthSuccess = { fg = colors.green },
-    healthWarning = { fg = colors.yellow },
-    helpCommand = { fg = colors.orange },
-    helpHyperTextJump = { fg = colors.aqua },
-    helpHeader = { fg = colors.white },
-    helpSectionDelim = { fg = colors.green },
-
-    -- treesitter
-    ["@variable"] = { fg = colors.fg },
-    ["@variable.builtin"] = { fg = colors.pink },
-    ["@variable.member"] = { link = "Identifier" },
-    ["@variable.parameter"] = { fg = colors.orange, italic = config.italics },
-    ["@variable.parameter.builtin"] = { link = "@variable.parameter" },
-
-    ["@constant"] = { link = "Constant" },
-    ["@constant.builtin"] = { fg = colors.aqua },
-    ["@constant.macro"] = { link = "Define" },
-
-    ["@module"] = { link = "Include" },
-    ["@module.builtin"] = { link = "@module" },
-    ["@label"] = { link = "Label" },
-
-    ["@string"] = { link = "String" },
-    ["@string.documentation"] = { fg = colors.cyan },
-    ["@string.regexp"] = { link = "String" },
-    ["@string.escape"] = { link = "SpecialChar" },
-    ["@string.special"] = { link = "Special" },
-    ["@string.special.symbol"] = { link = "Identifier" },
-    ["@string.special.url"] = { fg = colors.aqua, undercurl = true },
-    ["@string.special.path"] = { fg = colors.aqua, undercurl = true },
-
-    ["@character"] = { link = "Character" },
-    ["@character.special"] = { link = "SpecialChar" },
-
-    ["@boolean"] = { link = "Boolean" },
-    ["@number"] = { link = "Number" },
-    ["@number.float"] = { link = "Float" },
-
-    ["@type"] = { link = "Type" },
-    ["@type.builtin"] = { fg = colors.pink },
-    ["@type.definition"] = { link = "Typedef" },
-
-    ["@attribute"] = { link = "Type" },
-    ["@attribute.bultin"] = { link = "@attribute" },
-    ["@property"] = { link = "Identifier" },
-
-    ["@function"] = { link = "Function" },
-    ["@function.builtin"] = { link = "Function" },
-    ["@function.call"] = { link = "Function" },
-    ["@function.macro"] = { link = "Macro" },
-
-    ["@function.method"] = { link = "Function" },
-    ["@function.method.call"] = { link = "Function" },
-
-    ["@constructor"] = { fg = colors.aqua },
-    ["@operator"] = { link = "Operator" },
-
-    ["@keyword"] = { link = "Keyword" },
-    ["@keyword.coroutine"] = { link = "Keyword" },
-    ["@keyword.function"] = { fg = colors.pink },
-    ["@keyword.operator"] = { link = "Operator" },
-    ["@keyword.import"] = { link = "Include" },
-    ["@keyword.type"] = { link = "Type" },
-    ["@keyword.modifier"] = { fg = colors.pink },
-    ["@keyword.repeat"] = { link = "Repeat" },
-    ["@keyword.return"] = { fg = colors.pink },
-    ["@keyword.debug"] = { link = "Debug" },
-    ["@keyword.exception"] = { link = "Exception" },
-
-    ["@keyword.conditional"] = { link = "Conditional" },
-    ["@keyword.conditional.ternary"] = { link = "Conditional" },
-
-    ["@keyword.directive"] = { link = "PreProc" },
-    ["@keyword.directive.define"] = { link = "@keyword.directive" },
-
-    ["@punctuation.delimiter"] = { link = "Delimiter" },
-    ["@punctuation.bracket"] = { link = "Delimiter" },
-    ["@punctuation.special"] = { link = "Delimiter" },
-
-    ["@comment"] = { link = "Comment" },
-    ["@comment.error"] = { link = "ErrorMsg" },
-    ["@comment.hint"] = { link = "SpecialComment" },
-    ["@comment.todo"] = { link = "Todo" },
-    ["@comment.warning"] = { link = "WarningMsg" },
-
-    ["@markup.strong"] = { bold = true },
-    ["@markup.italic"] = { italic = true },
-    ["@markup.strikethrough"] = { strikethrough = true },
-    ["@markup.underline"] = { underline = true },
-
-    ["@markup.heading"] = { link = "Title" },
-
-    ["@markup.math"] = { link = "Special" },
-
-    ["@markup.link"] = { link = "Constant" },
-    ["@markup.link.label"] = { link = "SpecialChar" },
-    ["@markup.link.url"] = { fg = colors.aqua, undercurl = true },
-
-    ["@markup.raw"] = { link = "String" },
-
-    ["@markup.list"] = { link = "Delimiter" },
-    ["@markup.list.checked"] = { fg = colors.green },
-    ["@markup.list.unchecked"] = { fg = colors.pink },
-
-    ["@tag"] = { link = "Label" },
-    ["@tag.attribute"] = { link = "Identifier" },
-    ["@tag.delimiter"] = { link = "Delimiter" },
-
-    ["@none"] = {},
-
-    -- semantic tokens
-    ["@lsp.mod.deprecated"] = { fg = colors.light_gray, strikethrough = true },
-    ["@lsp.mod.documentation"] = { link = "Constant" },
-    ["@lsp.type.class"] = { link = "Type" },
-    ["@lsp.type.comment"] = { link = "Comment" },
-    ["@lsp.type.enum"] = { link = "Type" },
-    ["@lsp.type.enumMember"] = { link = "Constant" },
-    ["@lsp.type.function"] = { link = "Function" },
-    ["@lsp.type.macro"] = { link = "Function" },
-    ["@lsp.type.method"] = { link = "Function" },
-    ["@lsp.type.number"] = { link = "Number" },
-    ["@lsp.type.operator"] = { link = "Operator" },
-    ["@lsp.type.parameter"] = { fg = colors.orange, italic = config.italics },
-    ["@lsp.type.property"] = { link = "Identifier" },
-    ["@lsp.type.string"] = { link = "String" },
-    ["@lsp.type.struct"] = { link = "Type" },
-    ["@lsp.type.typeParameter"] = { link = "Type" },
-    ["@lsp.type.xmlDocCommentName"] = { fg = colors.pink },
-    ["@lsp.type.xmlDocCommentAttributeQuotes"] = { fg = colors.yellow },
-    ["@lsp.type.xmlDocCommentAttributeName"] = { fg = colors.green },
-
-    -- nvim-treesitter-context
-    TreesitterContext = { bg = config.transparent and colors.bg:lighten(0.85) or colors.bg:darken(0.8) },
-
-    -- nvim-ts-rainbow 2
-    TSRainbowRed = { fg = colors.dark_red },
-    TSRainbowOrange = { fg = colors.orange },
-    TSRainbowYellow = { fg = colors.yellow },
-    TSRainbowGreen = { fg = colors.green },
-    TSRainbowBlue = { fg = colors.aqua },
-    TSRainbowViolet = { fg = colors.purple },
-    TSRainbowCyan = { fg = colors.cyan },
-
-    -- rainbow-delimiters
-    RainbowDelimiterRed = { fg = colors.dark_red },
-    RainbowDelimiterOrange = { fg = colors.orange },
-    RainbowDelimiterYellow = { fg = colors.yellow },
-    RainbowDelimiterGreen = { fg = colors.green },
-    RainbowDelimiterBlue = { fg = colors.aqua },
-    RainbowDelimiterViolet = { fg = colors.purple },
-    RainbowDelimiterCyan = { fg = colors.cyan },
-
-    -- diff
-    DiffAdd = { bg = colors.green:darken(0.3) },
-    DiffChange = { bg = colors.white:darken(0.3) },
-    DiffDelete = { bg = colors.red:darken(0.3) },
-    DiffText = { bg = colors.cyan:darken(0.3) },
-
-    diffAdded = { fg = colors.green },
-    diffChanged = { fg = colors.white },
-    diffFile = { fg = colors.white },
-    diffIndexLine = { fg = colors.cyan },
-    diffLine = { fg = colors.purple },
-    diffRemoved = { fg = colors.pink },
-    diffSubname = { fg = colors.cyan },
-
-    -- fold
-    FoldColumn = { bg = colors.dark_blue },
-    Folded = { fg = colors.gray, bg = colors.dark_blue },
-
-    -- popup menu
-    Pmenu = { link = "NormalFloat" },
-    PmenuSel = { link = "Visual" },
-    PmenuThumb = { fg = colors.dark_green, bg = colors.dark_gray },
-
-    -- diagnostics
-    DiagnosticError = { fg = colors.red },
-    DiagnosticHint = { fg = colors.light_gray },
-    DiagnosticInfo = { fg = colors.white },
-    DiagnosticUnderlineError = { sp = colors.red, undercurl = true },
-    DiagnosticUnderlineHint = { sp = colors.light_gray, undercurl = true },
-    DiagnosticUnderlineInfo = { sp = colors.green, undercurl = true },
-    DiagnosticUnderlineWarn = { sp = colors.yellow, undercurl = true },
-    DiagnosticWarn = { fg = colors.yellow },
-
-    -- lsp document highlight
-    LspReferenceRead = { bg = colors.vulcan, bold = true },
-    LspReferenceText = { bg = colors.vulcan, bold = true },
-    LspReferenceWrite = { bg = colors.vulcan, bold = true },
-
-    -- vim-illuminate
-    IlluminatedWordRead = { link = "LspReferenceRead" },
-    IlluminatedWordText = { link = "LspReferenceText" },
-    IlluminatedWordWrite = { link = "LspReferenceWrite" },
-
-    LspInlayHint = { link = "Comment" },
-
-    -- nvim-lspconfig
-    LspInfoBorder = { link = "FloatBorder" },
-    LspInfoFiletype = { fg = colors.white },
-    LspInfoList = { fg = colors.aqua },
-    LspInfoTitle = { fg = colors.cyan },
-
-    -- telescope
-    TelescopeBorder = { link = "FloatBorder" },
-    TelescopeNormal = { link = "Normal" },
-    TelescopePromptCounter = { fg = colors.aqua },
-    TelescopeTitle = { fg = colors.aqua },
-
-    -- fzf-lua
-    FzfLuaNormal = { link = "NormalFloat" },
-    FzfLuaBorder = { link = "FloatBorder" },
-    FzfLuaTitle = { fg = colors.aqua },
-    FzfLuaFzfPointer = { fg = colors.fg, bg = colors.dark_gray },
-    FzfLuaFzfCursorLine = { link = "Visual" },
-    FzfLuaFzfGutter = { link = "Visual" },
-    FzfLuaFzfInfo = { fg = colors.green },
-    FzfLuaFzfPrompt = { fg = colors.pink },
-
-    -- leap
-    LeapBackdrop = { fg = colors.gray },
-    LeapLabelPrimary = { fg = colors.dark_pink },
-    LeapLabelSecondary = { fg = colors.dark_cyan },
-    LeapMatch = { fg = colors.dark_pink, underline = true },
-
-    -- sj
-    SjLabel = { fg = colors.dark_pink },
-    SjLimit = { link = "ErrorMsg" },
-    SjOverlay = { link = "Comment" },
-    SjSearch = { link = "IncSearch" },
-    SjWarning = { link = "WarningMsg" },
-
-    -- flash
-    FlashMatch = { link = "Search" },
-    FlashCurrent = { link = "IncSearch" },
-    FlashBackdrop = { link = "Comment" },
-    FlashLabel = { fg = colors.dark_pink },
-
-    -- mason
-    MasonError = { fg = colors.red },
-    MasonHeader = { fg = colors.dark_green, bg = colors.cyan, bold = true },
-    MasonHeaderSecondary = { fg = colors.dark_green, bg = colors.yellow, bold = true },
-    MasonHeading = { fg = colors.white, bold = true },
-    MasonHighlight = { fg = colors.aqua },
-    MasonHighlightBlock = { fg = colors.dark_blue, bg = colors.cyan },
-    MasonHighlightBlockBold = { fg = colors.dark_blue, bg = colors.cyan, bold = true },
-    MasonHighlightBlockBoldSecondary = { fg = colors.dark_blue, bg = colors.yellow, bold = true },
-    MasonHighlightBlockSecondary = { fg = colors.dark_blue, bg = colors.yellow },
-    MasonHighlightSecondary = { fg = colors.yellow },
-    MasonLink = { fg = colors.aqua },
-    MasonMuted = { fg = colors.pink },
-    MasonMutedBlock = { fg = colors.dark_blue, bg = colors.light_gray },
-    MasonMutedBlockBold = { fg = colors.dark_blue, bg = colors.light_gray, bold = true },
-
-    -- dashboard
-    DashboardCenter = { fg = colors.pink },
-    DashboardFooter = { fg = colors.aqua },
-    DashboardHeader = { fg = colors.peanut },
-
-    -- nvimtree
-    NvimTreeBookmark = { fg = colors.yellow },
-    NvimTreeEmptyFolderName = { link = "Directory" },
-    NvimTreeExecFile = { fg = colors.yellow, bold = true },
-    NvimTreeFolderIcon = { fg = colors.yellow },
-    NvimTreeFolderName = { link = "Directory" },
-    NvimTreeGitDeleted = { fg = colors.red },
-    NvimTreeGitDirty = { fg = colors.pink },
-    NvimTreeGitIgnored = { link = "Comment" },
-    NvimTreeGitMerge = { fg = colors.purple },
-    NvimTreeGitNew = { fg = colors.green },
-    NvimTreeGitRenamed = { fg = colors.pink },
-    NvimTreeGitStaged = { fg = colors.green },
-    NvimTreeImageFile = { fg = colors.purple, bold = true },
-    NvimTreeIndentMarker = { fg = colors.light_gray },
-    NvimTreeLiveFilterPrefix = { fg = colors.pink, bold = true },
-    NvimTreeLiveFilterValue = { bold = true },
-    NvimTreeOpenedFile = { fg = colors.yellow, bold = true },
-    NvimTreeOpenedFolderName = { link = "Directory" },
-    NvimTreeRootFolder = { fg = colors.pink },
-    NvimTreeSpecialFile = { fg = colors.green, bold = true, underline = true },
-    NvimTreeSymlink = { fg = colors.pink, bold = true },
-    NvimTreeWindowPicker = { fg = colors.white, bg = colors.aqua, bold = true },
-
-    -- oil
-    OilFile = { link = "Normal" },
-    OilDir = { link = "Directory" },
-    OilDirIcon = { fg = colors.yellow },
-    OilLink = { fg = colors.pink, bold = true },
-    OilLinkTarget = { link = "OilLink" },
-
-    -- bufferline
-    BufferLineDiagnostic = { fg = colors.dark_gray },
-    BufferLineDiagnosticSelected = { fg = colors.light_gray, bold = true, italic = config.italics },
-    BufferLineDiagnosticVisible = { fg = colors.dark_gray },
-    BufferLineErrorDiagnostic = { fg = colors.dark_gray, sp = colors.red },
-    BufferLineErrorDiagnosticSelected = { fg = colors.red, sp = colors.red, bold = true, italic = config.italics },
-    BufferLineErrorDiagnosticVisible = { fg = colors.red },
-    BufferLineHintDiagnostic = { fg = colors.dark_gray, sp = colors.light_gray },
-    BufferLineHintDiagnosticSelected = {
-        fg = colors.light_gray,
-        sp = colors.light_gray,
-        bold = true,
-        italic = config.italics,
-    },
-    BufferLineHintDiagnosticVisible = { fg = colors.light_gray },
-    BufferLineIndicatorSelected = { fg = colors.aqua },
-    BufferLineInfoDiagnostic = { fg = colors.dark_gray, sp = colors.green },
-    BufferLineInfoDiagnosticSelected = {
-        fg = colors.green,
-        sp = colors.green,
-        bold = true,
-        italic = config.italics,
-    },
-    BufferLineInfoDiagnosticVisible = { fg = colors.green },
-    BufferLineModified = { fg = colors.pink },
-    BufferLineModifiedSelected = { fg = colors.pink },
-    BufferLineModifiedVisible = { fg = colors.pink },
-    BufferLineNumbers = { fg = colors.purple },
-    BufferLineNumbersSelected = { fg = colors.purple },
-    BufferLineNumbersVisible = { fg = colors.purple },
-    BufferLineWarningDiagnostic = { fg = colors.dark_gray, sp = colors.yellow },
-    BufferLineWarningDiagnosticSelected = {
-        fg = colors.yellow,
-        sp = colors.yellow,
-        bold = true,
-        italic = config.italics,
-    },
-    BufferLineWarningDiagnosticVisible = { fg = colors.yellow },
-
-    -- whichkey
-    WhichKey = { fg = colors.yellow },
-    WhichKeySeparator = { fg = colors.pink },
-
-    -- nvim-cmp
-    CmpItemAbbrDeprecated = { fg = colors.light_gray, strikethrough = true },
-    CmpItemAbbrMatch = { fg = colors.aqua },
-    CmpItemAbbrMatchFuzzy = { link = "CmpItemAbbrMatch" },
-    CmpItemKindClass = { fg = colors.pink },
-    CmpItemKindConstant = { fg = colors.cyan },
-    CmpItemKindConstructor = { link = "@constructor" },
-    CmpItemKindEnum = { fg = colors.cyan },
-    CmpItemKindEnumMember = { fg = colors.yellow },
-    CmpItemKindEvent = { fg = colors.yellow },
-    CmpItemKindField = { fg = colors.yellow },
-    CmpItemKindFile = { fg = colors.white },
-    CmpItemKindFolder = { fg = colors.yellow },
-    CmpItemKindFunction = { link = "Function" },
-    CmpItemKindInterface = { fg = colors.pink },
-    CmpItemKindKeyword = { fg = colors.white },
-    CmpItemKindMethod = { link = "Function" },
-    CmpItemKindModule = { fg = colors.pink },
-    CmpItemKindOperator = { link = "Operator" },
-    CmpItemKindProperty = { fg = colors.yellow },
-    CmpItemKindStruct = { fg = colors.pink },
-    CmpItemKindText = { fg = colors.white },
-    CmpItemKindUnit = { fg = colors.orange },
-    CmpItemKindValue = { fg = colors.white },
-    CmpItemKindVariable = { fg = colors.cyan },
-
-    -- blink-cmp
-    BlinkCmpDocCursorLine = { link = "PmenuSel" },
-    BlinkCmpDocBorder = { link = "FloatBorder" },
-    BlinkCmpFloatBorder = { link = "FloatBorder" },
-    BlinkCmpLabelDeprecated = { fg = colors.light_gray, strikethrough = true },
-    BlinkCmpLabelMatch = { fg = colors.aqua },
-    BlinkCmpDocSeparator = { fg = colors.pink },
-
-    BlinkCmpKindClass = { fg = colors.pink },
-    BlinkCmpKindConstant = { fg = colors.cyan },
-    BlinkCmpKindConstructor = { link = "@constructor" },
-    BlinkCmpKindEnum = { fg = colors.cyan },
-    BlinkCmpKindEnumMember = { fg = colors.yellow },
-    BlinkCmpKindEvent = { fg = colors.yellow },
-    BlinkCmpKindField = { fg = colors.yellow },
-    BlinkCmpKindFile = { fg = colors.white },
-    BlinkCmpKindFolder = { fg = colors.yellow },
-    BlinkCmpKindFunction = { link = "Function" },
-    BlinkCmpKindInterface = { fg = colors.pink },
-    BlinkCmpKindKeyword = { fg = colors.white },
-    BlinkCmpKindMethod = { link = "Function" },
-    BlinkCmpKindModule = { fg = colors.pink },
-    BlinkCmpKindOperator = { link = "Operator" },
-    BlinkCmpKindProperty = { fg = colors.yellow },
-    BlinkCmpKindStruct = { fg = colors.pink },
-    BlinkCmpKindText = { fg = colors.white },
-    BlinkCmpKindUnit = { fg = colors.orange },
-    BlinkCmpKindValue = { fg = colors.white },
-    BlinkCmpKindVariable = { fg = colors.cyan },
-
-    -- git-conflict
-    GitConflictCurrent = { bg = colors.cyan:darken(0.3) },
-    GitConflictIncoming = { bg = colors.aqua:darken(0.3) },
-    GitConflictCurrentLabel = { fg = colors.fg, bg = colors.cyan:darken(0.6) },
-    GitConflictIncomingLabel = { fg = colors.fg, bg = colors.aqua:darken(0.6) },
-
-    -- conflict-marker
-    ConflictOurs = { bg = colors.cyan:darken(0.3) },
-    ConflictTheirs = { bg = colors.aqua:darken(0.3) },
-    ConflictOursMarker = { fg = colors.fg, bg = colors.cyan:darken(0.6) },
-    ConflictTheirsMarker = { fg = colors.fg, bg = colors.aqua:darken(0.6) },
-    ConflictMid = { fg = colors.white, bg = colors.vulcan },
-
-    -- lazy
-    LazyButton = { fg = colors.white, bg = colors.vulcan },
-    LazyButtonActive = { fg = colors.black, bg = colors.white },
-    LazyComment = { link = "Comment" },
-    LazyCommit = { fg = colors.green },
-    LazyDimmed = { link = "Comment" },
-    LazyCommitIssue = { link = "Number" },
-    LazyCommitScope = { italic = config.italics },
-    LazyCommitType = { fg = colors.yellow, bold = true },
-    LazyDir = { fg = colors.yellow },
-    LazyH1 = { fg = colors.black, bg = colors.white },
-    LazyH2 = { fg = colors.white, bold = true },
-    LazyNoCond = { link = "DiagnosticWarn" },
-    LazyNormal = { link = "NormalFloat" },
-    LazyProgressDone = { fg = colors.green },
-    LazyProgressTodo = { fg = colors.light_gray },
-    LazyProp = { fg = colors.gray },
-    LazyReasonCmd = { fg = colors.green },
-    LazyReasonEvent = { fg = colors.yellow },
-    LazyReasonFt = { fg = colors.orange },
-    LazyReasonImport = { fg = colors.pink },
-    LazyReasonKeys = { fg = colors.cyan },
-    LazyReasonPlugin = { fg = colors.purple },
-    LazyReasonRuntime = { fg = colors.cyan },
-    LazyReasonSource = { fg = colors.aqua },
-    LazyReasonStart = { fg = colors.green },
-    LazySpecial = { fg = colors.pink },
-    LazyTaskError = { link = "ErrorMsg" },
-    LazyTaskOutput = { link = "MsgArea" },
-    LazyUrl = { fg = colors.aqua, undercurl = true },
-    LazyValue = { fg = colors.fg },
-
-    -- nvim-navic
-    NavicIconsArray = { link = "Type" },
-    NavicIconsBoolean = { link = "Boolean" },
-    NavicIconsClass = { link = "CmpItemKindClass" },
-    NavicIconsConstant = { link = "CmpItemKindConstant" },
-    NavicIconsConstructor = { link = "CmpItemKindConstructor" },
-    NavicIconsEnum = { link = "CmpItemKindEnum" },
-    NavicIconsEnumMember = { link = "CmpItemKindEnumMember" },
-    NavicIconsEvent = { link = "CmpItemKindEvent" },
-    NavicIconsField = { link = "CmpItemKindField" },
-    NavicIconsFile = { link = "CmpItemKindFile" },
-    NavicIconsFunction = { link = "CmpItemKindFunction" },
-    NavicIconsInterface = { link = "CmpItemKindInterface" },
-    NavicIconsKey = { link = "CmpItemKindValue" },
-    NavicIconsMethod = { link = "CmpItemKindMethod" },
-    NavicIconsModule = { link = "CmpItemKindModule" },
-    NavicIconsNamespace = { link = "CmpItemKindModule" },
-    NavicIconsNull = { link = "Constant" },
-    NavicIconsNumber = { link = "Number" },
-    NavicIconsObject = { link = "CmpItemKindProperty" },
-    NavicIconsOperator = { link = "CmpItemKindOperator" },
-    NavicIconsPackage = { link = "CmpItemKindModule" },
-    NavicIconsProperty = { link = "CmpItemKindProperty" },
-    NavicIconsString = { link = "String" },
-    NavicIconsStruct = { link = "CmpItemKindStruct" },
-    NavicIconsTypeParameter = { link = "CmpItemKindTypeParameter" },
-    NavicIconsVariable = { link = "CmpItemKindVariable" },
-    NavicSeparator = { fg = colors.aqua },
-    NavicText = { link = "Normal" },
-
-    -- indent-blankline
-    IndentBlanklineIndent1 = { fg = colors.pink, nocombine = true },
-    IndentBlanklineIndent2 = { fg = colors.yellow, nocombine = true },
-    IndentBlanklineIndent3 = { fg = colors.green, nocombine = true },
-    IndentBlanklineIndent4 = { fg = colors.cyan, nocombine = true },
-    IndentBlanklineIndent5 = { fg = colors.aqua, nocombine = true },
-    IndentBlanklineIndent6 = { fg = colors.purple, nocombine = true },
-
-    -- crates
-    CratesNvimError = { fg = colors.red },
-    CratesNvimLoading = { fg = colors.purple },
-    CratesNvimNoMatch = { fg = colors.pink },
-    CratesNvimPopupEnabled = { fg = colors.green },
-    CratesNvimPopupFeature = { fg = colors.aqua },
-    CratesNvimPopupPreRelease = { fg = colors.cyan },
-    CratesNvimPopupTitle = { fg = colors.purple },
-    CratesNvimPopupTransitive = { fg = colors.pink },
-    CratesNvimPopupUrl = { fg = colors.aqua },
-    CratesNvimPopupVersion = { fg = colors.green },
-    CratesNvimPopupYanked = { fg = colors.pink },
-    CratesNvimPreRelease = { fg = colors.cyan },
-    CratesNvimUpgrade = { fg = colors.yellow },
-    CratesNvimVersion = { fg = colors.green },
-    CratesNvimYanked = { fg = colors.red },
-
-    -- notify
-    NotifyDEBUGBody = { fg = colors.fg },
-    NotifyDEBUGBorder = { fg = colors.purple },
-    NotifyDEBUGIcon = { fg = colors.purple },
-    NotifyDEBUGTitle = { fg = colors.purple },
-    NotifyERRORBody = { fg = colors.fg },
-    NotifyERRORBorder = { fg = colors.red },
-    NotifyERRORIcon = { fg = colors.red },
-    NotifyERRORTitle = { fg = colors.red },
-    NotifyINFOBody = { fg = colors.fg },
-    NotifyINFOBorder = { fg = colors.green },
-    NotifyINFOIcon = { fg = colors.green },
-    NotifyINFOTitle = { fg = colors.green },
-    NotifyTRACEBody = { fg = colors.fg },
-    NotifyTRACEBorder = { fg = colors.white },
-    NotifyTRACEIcon = { fg = colors.white },
-    NotifyTRACETitle = { fg = colors.white },
-    NotifyWARNBody = { fg = colors.fg },
-    NotifyWARNBorder = { fg = colors.yellow },
-    NotifyWARNIcon = { fg = colors.yellow },
-    NotifyWARNTitle = { fg = colors.yellow },
-
-    -- echasnovski/mini.nvim
-    MiniStatuslineDevinfo = { fg = colors.fg, bg = colors.vulcan },
-    MiniStatuslineFileinfo = { link = "MiniStatuslineDevinfo" },
-    MiniStatuslineFilename = { fg = colors.fg, bg = colors.black },
-    MiniStatuslineInactive = { link = "MiniStatuslineFilename" },
-    MiniStatuslineModeNormal = { fg = colors.dark_blue, bg = colors.green, bold = true },
-    MiniStatuslineModeInsert = { fg = colors.dark_blue, bg = colors.yellow, bold = true },
-    MiniStatuslineModeVisual = { fg = colors.dark_blue, bg = colors.purple, bold = true },
-    MiniStatuslineModeCommand = { fg = colors.dark_blue, bg = colors.aqua, bold = true },
-    MiniStatuslineModeReplace = { fg = colors.dark_blue, bg = colors.pink, bold = true },
-    MiniStatuslineModeOther = { fg = colors.dark_blue, bg = colors.green, bold = true }, -- fallback
-
-    MiniAnimateCursor = { reverse = true, nocombine = true },
-    MiniAnimateNormalFloat = { link = "NormalFloat" },
-
-    MiniClueBorder = { link = "FloatBorder" },
-    MiniClueDescGroup = { link = "DiagnosticWarn" },
-    MiniClueDescSingle = { link = "NormalFloat" },
-    MiniClueNextKey = { link = "DiagnosticHint" },
-    MiniClueNextKeyWithPostkeys = { link = "DiagnosticError" },
-    MiniClueSeparator = { link = "DiagnosticInfo" },
-    MiniClueTitle = { bg = colors.vulcan, bold = true },
-
-    MiniCompletionActiveParameter = { underline = true },
-
-    MiniCursorword = { underline = true },
-    MiniCursorwordCurrent = { underline = true },
-
-    MiniDiffOverAdd = { fg = colors.green, bg = colors.green, blend = 20 },
-    MiniDiffOverChange = { fg = colors.white, bg = colors.white, blend = 20 },
-    MiniDiffOverContext = { bg = colors.black },
-    MiniDiffOverDelete = { fg = colors.red, bg = colors.red, blend = 20 },
-    MiniDiffSignAdd = { fg = colors.green },
-    MiniDiffSignChange = { fg = colors.white },
-    MiniDiffSignDelete = { fg = colors.red },
-
-    MiniFilesBorder = { link = "FloatBorder" },
-    MiniFilesBorderModified = { link = "DiagnosticWarn" },
-    MiniFilesCursorLine = { link = "CursorLine" },
-    MiniFilesDirectory = { link = "Directory" },
-    MiniFilesFile = { fg = colors.fg },
-    MiniFilesNormal = { link = "NormalFloat" },
-    MiniFilesTitle = { link = "FloatTitle" },
-    MiniFilesTitleFocused = { fg = colors.pink, bg = colors.vulcan, bold = true },
-
-    MiniHipatternsFixme = { fg = colors.bg, bg = colors.red, bold = true },
-    MiniHipatternsHack = { fg = colors.bg, bg = colors.yellow, bold = true },
-    MiniHipatternsNote = { fg = colors.bg, bg = colors.cyan, bold = true },
-    MiniHipatternsTodo = { fg = colors.bg, bg = colors.aqua, bold = true },
-
-    MiniIndentscopeSymbol = { fg = colors.light_gray },
-    MiniIndentscopeSymbolOff = { fg = colors.yellow },
-
-    MiniJump = { sp = colors.yellow, undercurl = true },
-    MiniJump2dDim = { fg = colors.gray },
-    MiniJump2dSpot = { fg = colors.yellow, bold = true, nocombine = true },
-    MiniJump2dSpotAhead = { fg = colors.green, bg = colors.black, nocombine = true },
-    MiniJump2dSpotUnique = { fg = colors.pink, bold = true, nocombine = true },
-
-    MiniMapNormal = { link = "NormalFloat" },
-    MiniMapSymbolCount = { link = "Special" },
-    MiniMapSymbolLine = { link = "Title" },
-    MiniMapSymbolView = { link = "Delimiter" },
-
-    MiniNotifyBorder = { link = "FloatBorder" },
-    MiniNotifyNormal = { link = "NormalFloat" },
-    MiniNotifyTitle = { link = "FloatTitle" },
-
-    MiniOperatorsExchangeFrom = { link = "IncSearch" },
-
-    MiniPickBorder = { link = "FloatBorder" },
-    MiniPickBorderBusy = { link = "DiagnosticWarn" },
-    MiniPickBorderText = { bg = colors.vulcan },
-    MiniPickIconDirectory = { link = "Directory" },
-    MiniPickIconFile = { link = "NormalFloat" },
-    MiniPickHeader = { link = "DiagnosticHint" },
-    MiniPickMatchCurrent = { link = "CursorLine" },
-    MiniPickMatchMarked = { link = "Visual" },
-    MiniPickMatchRanges = { fg = colors.green },
-    MiniPickNormal = { link = "NormalFloat" },
-    MiniPickPreviewLine = { link = "CursorLine" },
-    MiniPickPreviewRegion = { link = "IncSearch" },
-    MiniPickPrompt = { bg = colors.vulcan, bold = true },
-
-    MiniStarterCurrent = { nocombine = true },
-    MiniStarterFooter = { fg = colors.gray },
-    MiniStarterHeader = { link = "Title" },
-    MiniStarterInactive = { link = "Comment" },
-    MiniStarterItem = { link = "Normal" },
-    MiniStarterItemBullet = { link = "Delimiter" },
-    MiniStarterItemPrefix = { link = "WarningMsg" },
-    MiniStarterSection = { fg = colors.pink },
-    MiniStarterQuery = { link = "MoreMsg" },
-
-    MiniSurround = { link = "IncSearch" },
-
-    MiniTablineCurrent = { fg = colors.fg, bg = colors.vulcan, bold = true },
-    MiniTablineFill = { link = "TabLineFill" },
-    MiniTablineHidden = { fg = colors.gray, bg = colors.vulcan },
-    MiniTablineModifiedCurrent = { fg = colors.vulcan, bg = colors.fg, bold = true },
-    MiniTablineModifiedHidden = { fg = colors.vulcan, bg = colors.gray },
-    MiniTablineModifiedVisible = { fg = colors.vulcan, bg = colors.fg },
-    MiniTablineTabpagesection = { link = "Search" },
-    MiniTablineVisible = { fg = colors.fg, bg = colors.vulcan },
-
-    MiniTestEmphasis = { bold = true },
-    MiniTestFail = { fg = colors.red, bold = true },
-    MiniTestPass = { fg = colors.green, bold = true },
-
-    MiniTrailspace = { bg = colors.red },
-
-    -- folke/snacks.nvim
-    SnacksNormal = { link = "NormalFloat" },
-    SnacksWinBar = { link = "Title" },
-    SnacksBackdrop = { fg = colors.vulcan },
-    SnacksNormalNC = { link = "NormalFloat" },
-    SnacksWinBarNC = { link = "SnacksWinBar" },
-
-    SnacksNotifierInfo = { fg = colors.green },
-    SnacksNotifierIconInfo = { fg = colors.green },
-    SnacksNotifierTitleInfo = { fg = colors.green, italic = true },
-    SnacksNotifierFooterInfo = { link = "DiagnosticInfo" },
-    SnacksNotifierBorderInfo = { fg = colors.green },
-
-    SnacksNotifierWarn = { fg = colors.yellow },
-    SnacksNotifierIconWarn = { fg = colors.yellow },
-    SnacksNotifierTitleWarn = { fg = colors.yellow, italic = true },
-    SnacksNotifierFooterWarn = { link = "DiagnosticWarn" },
-    SnacksNotifierBorderWarn = { fg = colors.yellow },
-
-    SnacksNotifierDebug = { fg = colors.orange },
-    SnacksNotifierIconDebug = { fg = colors.orange },
-    SnacksNotifierTitleDebug = { fg = colors.orange, italic = true },
-    SnacksNotifierFooterDebug = { link = "DiagnosticHint" },
-    SnacksNotifierBorderDebug = { fg = colors.orange },
-
-    SnacksNotifierError = { fg = colors.red },
-    SnacksNotifierIconError = { fg = colors.red },
-    SnacksNotifierTitleError = { fg = colors.red, italic = true },
-    SnacksNotifierFooterError = { link = "DiagnosticError" },
-    SnacksNotifierBorderError = { fg = colors.red },
-
-    SnacksNotifierTrace = { fg = colors.white },
-    SnacksNotifierIconTrace = { fg = colors.white },
-    SnacksNotifierTitleTrace = { fg = colors.white, italic = true },
-    SnacksNotifierFooterTrace = { link = "DiagnosticHint" },
-    SnacksNotifierBorderTrace = { fg = colors.white },
-
-    SnacksDashboardNormal = { link = "Normal" },
-    SnacksDashboardDesc = { fg = colors.green },
-    SnacksDashboardFile = { fg = colors.cyan },
-    SnacksDashboardDir = { link = "Nontext" },
-    SnacksDashboardFooter = { fg = colors.yellow, italic = true },
-    SnacksDashboardHeader = { fg = colors.green },
-    SnacksDashboardIcon = { fg = colors.pink, bold = true },
-    SnacksDashboardKey = { fg = colors.orange },
-    SnacksDashboardTerminal = { link = "SnacksDashboardNormal" },
-    SnacksDashboardSpecial = { link = "Special" },
-    SnacksDashboardTitle = { link = "Title" },
-
-    SnacksIndent = { fg = colors.dark_gray },
-    SnacksIndentScope = { fg = colors.light_gray },
-
-    SnacksPicker = { link = "NormalFloat" },
-    SnacksPickerInputBorder = { link = "SnacksPickerBorder" },
-    SnacksPickerBorder = { link = "FloatBorder" },
-    SnacksPickerSelected = {
-        fg = config.transparent and colors.pink or colors.fg,
-        bg = config.transparent and colors.none or colors.vulcan,
-        bold = true,
-    },
-    SnacksPickerMatch = { fg = colors.green },
-}
-
--- Hide all semantic highlights by default, only enable those from the default table.
-for _, semantic_group in ipairs(vim.fn.getcompletion("@lsp", "highlight")) do
-    if not defaults[semantic_group] then
-        defaults[semantic_group] = {}
-    end
-end
-
-groups = vim.deepcopy(defaults)
-
-return groups
diff --git a/lua/one_monokai/highlights/groups/blink_cmp.lua b/lua/one_monokai/highlights/groups/blink_cmp.lua
new file mode 100644
index 0000000..b2e2ad6
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/blink_cmp.lua
@@ -0,0 +1,35 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    BlinkCmpDocCursorLine = { link = "PmenuSel" },
+    BlinkCmpDocBorder = { link = "FloatBorder" },
+    BlinkCmpFloatBorder = { link = "FloatBorder" },
+    BlinkCmpLabelDeprecated = { fg = colors.light_gray, strikethrough = true },
+    BlinkCmpLabelMatch = { fg = colors.aqua },
+    BlinkCmpDocSeparator = { fg = colors.pink },
+
+    BlinkCmpKindClass = { fg = colors.pink },
+    BlinkCmpKindConstant = { fg = colors.cyan },
+    BlinkCmpKindConstructor = { link = "@constructor" },
+    BlinkCmpKindEnum = { fg = colors.cyan },
+    BlinkCmpKindEnumMember = { fg = colors.yellow },
+    BlinkCmpKindEvent = { fg = colors.yellow },
+    BlinkCmpKindField = { fg = colors.yellow },
+    BlinkCmpKindFile = { fg = colors.white },
+    BlinkCmpKindFolder = { fg = colors.yellow },
+    BlinkCmpKindFunction = { link = "Function" },
+    BlinkCmpKindInterface = { fg = colors.pink },
+    BlinkCmpKindKeyword = { fg = colors.white },
+    BlinkCmpKindMethod = { link = "Function" },
+    BlinkCmpKindModule = { fg = colors.pink },
+    BlinkCmpKindOperator = { link = "Operator" },
+    BlinkCmpKindProperty = { fg = colors.yellow },
+    BlinkCmpKindStruct = { fg = colors.pink },
+    BlinkCmpKindText = { fg = colors.white },
+    BlinkCmpKindUnit = { fg = colors.orange },
+    BlinkCmpKindValue = { fg = colors.white },
+    BlinkCmpKindVariable = { fg = colors.cyan },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/bufferline.lua b/lua/one_monokai/highlights/groups/bufferline.lua
new file mode 100644
index 0000000..e711693
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/bufferline.lua
@@ -0,0 +1,45 @@
+local colors = require "one_monokai.colors"
+local config = require "one_monokai.config"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    BufferLineDiagnostic = { fg = colors.dark_gray },
+    BufferLineDiagnosticSelected = { fg = colors.light_gray, bold = true, italic = config.italics },
+    BufferLineDiagnosticVisible = { fg = colors.dark_gray },
+    BufferLineErrorDiagnostic = { fg = colors.dark_gray, sp = colors.red },
+    BufferLineErrorDiagnosticSelected = { fg = colors.red, sp = colors.red, bold = true, italic = config.italics },
+    BufferLineErrorDiagnosticVisible = { fg = colors.red },
+    BufferLineHintDiagnostic = { fg = colors.dark_gray, sp = colors.light_gray },
+    BufferLineHintDiagnosticSelected = {
+        fg = colors.light_gray,
+        sp = colors.light_gray,
+        bold = true,
+        italic = config.italics,
+    },
+    BufferLineHintDiagnosticVisible = { fg = colors.light_gray },
+    BufferLineIndicatorSelected = { fg = colors.aqua },
+    BufferLineInfoDiagnostic = { fg = colors.dark_gray, sp = colors.green },
+    BufferLineInfoDiagnosticSelected = {
+        fg = colors.green,
+        sp = colors.green,
+        bold = true,
+        italic = config.italics,
+    },
+    BufferLineInfoDiagnosticVisible = { fg = colors.green },
+    BufferLineModified = { fg = colors.pink },
+    BufferLineModifiedSelected = { fg = colors.pink },
+    BufferLineModifiedVisible = { fg = colors.pink },
+    BufferLineNumbers = { fg = colors.purple },
+    BufferLineNumbersSelected = { fg = colors.purple },
+    BufferLineNumbersVisible = { fg = colors.purple },
+    BufferLineWarningDiagnostic = { fg = colors.dark_gray, sp = colors.yellow },
+    BufferLineWarningDiagnosticSelected = {
+        fg = colors.yellow,
+        sp = colors.yellow,
+        bold = true,
+        italic = config.italics,
+    },
+    BufferLineWarningDiagnosticVisible = { fg = colors.yellow },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/checkhealth.lua b/lua/one_monokai/highlights/groups/checkhealth.lua
new file mode 100644
index 0000000..32f816d
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/checkhealth.lua
@@ -0,0 +1,13 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    healthSuccess = { fg = colors.green },
+    healthWarning = { fg = colors.yellow },
+    helpCommand = { fg = colors.orange },
+    helpHyperTextJump = { fg = colors.aqua },
+    helpHeader = { fg = colors.white },
+    helpSectionDelim = { fg = colors.green },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/conflict_markers.lua b/lua/one_monokai/highlights/groups/conflict_markers.lua
new file mode 100644
index 0000000..19abec3
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/conflict_markers.lua
@@ -0,0 +1,12 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    ConflictOurs = { bg = colors.cyan:darken(0.3) },
+    ConflictTheirs = { bg = colors.aqua:darken(0.3) },
+    ConflictOursMarker = { fg = colors.fg, bg = colors.cyan:darken(0.6) },
+    ConflictTheirsMarker = { fg = colors.fg, bg = colors.aqua:darken(0.6) },
+    ConflictMid = { fg = colors.white, bg = colors.vulcan },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/core.lua b/lua/one_monokai/highlights/groups/core.lua
new file mode 100644
index 0000000..b81a923
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/core.lua
@@ -0,0 +1,100 @@
+local colors = require "one_monokai.colors"
+local config = require "one_monokai.config"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    Normal = { fg = colors.fg, bg = config.transparent and colors.none or colors.bg },
+    Visual = { bg = colors.dark_gray },
+
+    NormalFloat = { link = "Normal" },
+    FloatTitle = { fg = colors.pink },
+
+    Cursor = { fg = colors.bg, bg = colors.fg },
+    CursorColumn = { bg = colors.vulcan },
+    CursorLine = { bg = colors.vulcan },
+    CursorLineNr = { fg = colors.fg },
+    LineNr = { fg = colors.dark_gray },
+
+    StatusLine = { fg = colors.light_gray, bg = colors.black },
+    StatusLineNC = { fg = colors.light_gray, bg = colors.dark_blue },
+
+    WinBar = { link = "Normal" },
+    WinBarNC = { link = "NormalNC" },
+
+    ColorColumn = { bg = colors.dark_blue },
+    MatchParen = { bg = colors.dark_gray, bold = true },
+    ModeMsg = { fg = colors.yellow },
+    MoreMsg = { fg = colors.yellow },
+    Nontext = { fg = colors.dark_gray:lighten(0.8) },
+    Whitespace = { fg = colors.dark_gray:darken(0.91) },
+    Question = { fg = colors.yellow },
+    Search = { fg = colors.bg, bg = colors.yellow },
+    SignColumn = {},
+    TabLine = { fg = colors.fg, bg = config.transparent and colors.none or colors.dark_blue },
+    VertSplit = { fg = colors.fg },
+    Directory = { fg = colors.aqua },
+    SpecialKey = { fg = colors.pink },
+    Title = { fg = colors.yellow },
+    Ignore = { fg = colors.yellow },
+    Underlined = { fg = colors.green, underline = true },
+
+    QuickFixLine = { bg = colors.vulcan },
+
+    FoldColumn = { bg = colors.dark_blue },
+    Folded = { fg = colors.gray, bg = colors.dark_blue },
+
+    Pmenu = { link = "NormalFloat" },
+    PmenuSel = { link = "Visual" },
+    PmenuThumb = { fg = colors.dark_green, bg = colors.dark_gray },
+
+    ErrorMsg = { fg = colors.red },
+    WarningMsg = { fg = colors.yellow },
+
+    DiagnosticError = { fg = colors.red },
+    DiagnosticHint = { fg = colors.light_gray },
+    DiagnosticInfo = { fg = colors.white },
+    DiagnosticUnderlineError = { sp = colors.red, undercurl = true },
+    DiagnosticUnderlineHint = { sp = colors.light_gray, undercurl = true },
+    DiagnosticUnderlineInfo = { sp = colors.green, undercurl = true },
+    DiagnosticUnderlineWarn = { sp = colors.yellow, undercurl = true },
+    DiagnosticWarn = { fg = colors.yellow },
+
+    -- Do not exceed this line. All further additions should be placed above.
+    Boolean = { fg = colors.cyan },
+    Character = { fg = colors.yellow },
+    Constant = { fg = colors.aqua },
+    Float = { fg = colors.purple },
+    Number = { fg = colors.purple },
+    String = { fg = colors.yellow },
+
+    StorageClass = { fg = colors.cyan },
+    Structure = { fg = colors.cyan },
+    Type = { fg = colors.aqua },
+    Typedef = { fg = colors.aqua },
+
+    Function = { fg = colors.green },
+    Identifier = { fg = colors.green },
+
+    Keyword = { fg = colors.cyan },
+    Label = { fg = colors.pink },
+    Operator = { fg = colors.pink },
+    Statement = { fg = colors.pink },
+
+    Define = { fg = colors.pink },
+    Include = { fg = colors.pink },
+    Macro = { fg = colors.green },
+    PreCondit = { fg = colors.pink },
+    PreProc = { fg = colors.green },
+    Conceal = { fg = colors.light_gray },
+
+    Delimiter = { fg = colors.pink },
+    Special = { fg = colors.purple },
+    SpecialChar = { fg = colors.pink },
+    SpecialComment = { fg = colors.cyan },
+    Tag = { fg = colors.pink },
+
+    Comment = { fg = colors.gray, italic = config.italics },
+    Todo = { fg = colors.orange, bold = true, italic = config.italics },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/crates.lua b/lua/one_monokai/highlights/groups/crates.lua
new file mode 100644
index 0000000..db1d56a
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/crates.lua
@@ -0,0 +1,22 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    CratesNvimError = { fg = colors.red },
+    CratesNvimLoading = { fg = colors.purple },
+    CratesNvimNoMatch = { fg = colors.pink },
+    CratesNvimPopupEnabled = { fg = colors.green },
+    CratesNvimPopupFeature = { fg = colors.aqua },
+    CratesNvimPopupPreRelease = { fg = colors.cyan },
+    CratesNvimPopupTitle = { fg = colors.purple },
+    CratesNvimPopupTransitive = { fg = colors.pink },
+    CratesNvimPopupUrl = { fg = colors.aqua },
+    CratesNvimPopupVersion = { fg = colors.green },
+    CratesNvimPopupYanked = { fg = colors.pink },
+    CratesNvimPreRelease = { fg = colors.cyan },
+    CratesNvimUpgrade = { fg = colors.yellow },
+    CratesNvimVersion = { fg = colors.green },
+    CratesNvimYanked = { fg = colors.red },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/dashboard.lua b/lua/one_monokai/highlights/groups/dashboard.lua
new file mode 100644
index 0000000..08fd44d
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/dashboard.lua
@@ -0,0 +1,10 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    DashboardCenter = { fg = colors.pink },
+    DashboardFooter = { fg = colors.aqua },
+    DashboardHeader = { fg = colors.peanut },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/diff.lua b/lua/one_monokai/highlights/groups/diff.lua
new file mode 100644
index 0000000..b361c43
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/diff.lua
@@ -0,0 +1,19 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    DiffAdd = { bg = colors.green:darken(0.3) },
+    DiffChange = { bg = colors.white:darken(0.3) },
+    DiffDelete = { bg = colors.red:darken(0.3) },
+    DiffText = { bg = colors.cyan:darken(0.3) },
+
+    diffAdded = { fg = colors.green },
+    diffChanged = { fg = colors.white },
+    diffFile = { fg = colors.white },
+    diffIndexLine = { fg = colors.cyan },
+    diffLine = { fg = colors.purple },
+    diffRemoved = { fg = colors.pink },
+    diffSubname = { fg = colors.cyan },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/flash.lua b/lua/one_monokai/highlights/groups/flash.lua
new file mode 100644
index 0000000..2d563b8
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/flash.lua
@@ -0,0 +1,11 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    FlashMatch = { link = "Search" },
+    FlashCurrent = { link = "IncSearch" },
+    FlashBackdrop = { link = "Comment" },
+    FlashLabel = { fg = colors.dark_pink },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/fzf.lua b/lua/one_monokai/highlights/groups/fzf.lua
new file mode 100644
index 0000000..c30a6ea
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/fzf.lua
@@ -0,0 +1,15 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    FzfLuaNormal = { link = "NormalFloat" },
+    FzfLuaBorder = { link = "FloatBorder" },
+    FzfLuaTitle = { fg = colors.aqua },
+    FzfLuaFzfPointer = { fg = colors.fg, bg = colors.dark_gray },
+    FzfLuaFzfCursorLine = { link = "Visual" },
+    FzfLuaFzfGutter = { link = "Visual" },
+    FzfLuaFzfInfo = { fg = colors.green },
+    FzfLuaFzfPrompt = { fg = colors.pink },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/git_conflict.lua b/lua/one_monokai/highlights/groups/git_conflict.lua
new file mode 100644
index 0000000..b51fbad
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/git_conflict.lua
@@ -0,0 +1,11 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    GitConflictCurrent = { bg = colors.cyan:darken(0.3) },
+    GitConflictIncoming = { bg = colors.aqua:darken(0.3) },
+    GitConflictCurrentLabel = { fg = colors.fg, bg = colors.cyan:darken(0.6) },
+    GitConflictIncomingLabel = { fg = colors.fg, bg = colors.aqua:darken(0.6) },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/indent_blankline.lua b/lua/one_monokai/highlights/groups/indent_blankline.lua
new file mode 100644
index 0000000..ac92615
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/indent_blankline.lua
@@ -0,0 +1,13 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    IndentBlanklineIndent1 = { fg = colors.pink, nocombine = true },
+    IndentBlanklineIndent2 = { fg = colors.yellow, nocombine = true },
+    IndentBlanklineIndent3 = { fg = colors.green, nocombine = true },
+    IndentBlanklineIndent4 = { fg = colors.cyan, nocombine = true },
+    IndentBlanklineIndent5 = { fg = colors.aqua, nocombine = true },
+    IndentBlanklineIndent6 = { fg = colors.purple, nocombine = true },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/init.lua b/lua/one_monokai/highlights/groups/init.lua
new file mode 100644
index 0000000..6a34952
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/init.lua
@@ -0,0 +1,58 @@
+---@class one_monokai.highlights.groups
+---@field [string] vim.api.keyset.highlight
+local groups = {}
+
+---@type string[]
+local plugins = {
+    "blink_cmp",
+    "bufferline",
+    "checkhealth",
+    "conflict_markers",
+    "crates",
+    "dashboard",
+    "diff",
+    "flash",
+    "fzf",
+    "git_conflict",
+    "indent_blankline",
+    "lazy",
+    "leap",
+    "lsp",
+    "mason",
+    "mini",
+    "nvim_cmp",
+    "nvim_navic",
+    "nvim_notify",
+    "nvimtree",
+    "oil",
+    "rainbow_delimiters",
+    "sj",
+    "snacks",
+    "telescope",
+    "treesitter",
+    "vim_illuminate",
+    "whichkey",
+}
+
+for _, plugin in ipairs(plugins) do
+    ---@type table<string, vim.api.keyset.highlight>
+    local default_groups = require(("one_monokai.highlights.groups.%s"):format(plugin))
+
+    for name, attrs in pairs(default_groups) do
+        groups[name] = attrs
+    end
+end
+
+local config = require "one_monokai.config"
+
+if config.highlights then
+    local colors = require "one_monokai.colors"
+    ---@type table<string, vim.api.keyset.highlight>
+    local user_groups = config.highlights(colors)
+
+    for name, attrs in pairs(user_groups) do
+        groups[name] = attrs
+    end
+end
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/lazy.lua b/lua/one_monokai/highlights/groups/lazy.lua
new file mode 100644
index 0000000..9c699d9
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/lazy.lua
@@ -0,0 +1,38 @@
+local colors = require "one_monokai.colors"
+local config = require "one_monokai.config"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    LazyButton = { fg = colors.white, bg = colors.vulcan },
+    LazyButtonActive = { fg = colors.black, bg = colors.white },
+    LazyComment = { link = "Comment" },
+    LazyCommit = { fg = colors.green },
+    LazyDimmed = { link = "Comment" },
+    LazyCommitIssue = { link = "Number" },
+    LazyCommitScope = { italic = config.italics },
+    LazyCommitType = { fg = colors.yellow, bold = true },
+    LazyDir = { fg = colors.yellow },
+    LazyH1 = { fg = colors.black, bg = colors.white },
+    LazyH2 = { fg = colors.white, bold = true },
+    LazyNoCond = { link = "DiagnosticWarn" },
+    LazyNormal = { link = "NormalFloat" },
+    LazyProgressDone = { fg = colors.green },
+    LazyProgressTodo = { fg = colors.light_gray },
+    LazyProp = { fg = colors.gray },
+    LazyReasonCmd = { fg = colors.green },
+    LazyReasonEvent = { fg = colors.yellow },
+    LazyReasonFt = { fg = colors.orange },
+    LazyReasonImport = { fg = colors.pink },
+    LazyReasonKeys = { fg = colors.cyan },
+    LazyReasonPlugin = { fg = colors.purple },
+    LazyReasonRuntime = { fg = colors.cyan },
+    LazyReasonSource = { fg = colors.aqua },
+    LazyReasonStart = { fg = colors.green },
+    LazySpecial = { fg = colors.pink },
+    LazyTaskError = { link = "ErrorMsg" },
+    LazyTaskOutput = { link = "MsgArea" },
+    LazyUrl = { fg = colors.aqua, undercurl = true },
+    LazyValue = { fg = colors.fg },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/leap.lua b/lua/one_monokai/highlights/groups/leap.lua
new file mode 100644
index 0000000..9da30c5
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/leap.lua
@@ -0,0 +1,11 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    LeapBackdrop = { fg = colors.gray },
+    LeapLabelPrimary = { fg = colors.dark_pink },
+    LeapLabelSecondary = { fg = colors.dark_cyan },
+    LeapMatch = { fg = colors.dark_pink, underline = true },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/lsp.lua b/lua/one_monokai/highlights/groups/lsp.lua
new file mode 100644
index 0000000..6c5ac84
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/lsp.lua
@@ -0,0 +1,45 @@
+local colors = require "one_monokai.colors"
+local config = require "one_monokai.config"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    ["@lsp.mod.deprecated"] = { fg = colors.light_gray, strikethrough = true },
+    ["@lsp.mod.documentation"] = { link = "Constant" },
+    ["@lsp.type.class"] = { link = "Type" },
+    ["@lsp.type.comment"] = { link = "Comment" },
+    ["@lsp.type.enum"] = { link = "Type" },
+    ["@lsp.type.enumMember"] = { link = "Constant" },
+    ["@lsp.type.function"] = { link = "Function" },
+    ["@lsp.type.macro"] = { link = "Function" },
+    ["@lsp.type.method"] = { link = "Function" },
+    ["@lsp.type.number"] = { link = "Number" },
+    ["@lsp.type.operator"] = { link = "Operator" },
+    ["@lsp.type.parameter"] = { fg = colors.orange, italic = config.italics },
+    ["@lsp.type.property"] = { link = "Identifier" },
+    ["@lsp.type.string"] = { link = "String" },
+    ["@lsp.type.struct"] = { link = "Type" },
+    ["@lsp.type.typeParameter"] = { link = "Type" },
+    ["@lsp.type.xmlDocCommentName"] = { fg = colors.pink },
+    ["@lsp.type.xmlDocCommentAttributeQuotes"] = { fg = colors.yellow },
+    ["@lsp.type.xmlDocCommentAttributeName"] = { fg = colors.green },
+
+    LspReferenceRead = { bg = colors.vulcan, bold = true },
+    LspReferenceText = { bg = colors.vulcan, bold = true },
+    LspReferenceWrite = { bg = colors.vulcan, bold = true },
+
+    LspInlayHint = { link = "Comment" },
+
+    LspInfoBorder = { link = "FloatBorder" },
+    LspInfoFiletype = { fg = colors.white },
+    LspInfoList = { fg = colors.aqua },
+    LspInfoTitle = { fg = colors.cyan },
+}
+
+-- Hide all semantic highlights by default, only enable those from the default table.
+for _, semantic_group in ipairs(vim.fn.getcompletion("@lsp", "highlight")) do
+    if not groups[semantic_group] then
+        groups[semantic_group] = {}
+    end
+end
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/mason.lua b/lua/one_monokai/highlights/groups/mason.lua
new file mode 100644
index 0000000..c06c4dc
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/mason.lua
@@ -0,0 +1,21 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    MasonError = { fg = colors.red },
+    MasonHeader = { fg = colors.dark_green, bg = colors.cyan, bold = true },
+    MasonHeaderSecondary = { fg = colors.dark_green, bg = colors.yellow, bold = true },
+    MasonHeading = { fg = colors.white, bold = true },
+    MasonHighlight = { fg = colors.aqua },
+    MasonHighlightBlock = { fg = colors.dark_blue, bg = colors.cyan },
+    MasonHighlightBlockBold = { fg = colors.dark_blue, bg = colors.cyan, bold = true },
+    MasonHighlightBlockBoldSecondary = { fg = colors.dark_blue, bg = colors.yellow, bold = true },
+    MasonHighlightBlockSecondary = { fg = colors.dark_blue, bg = colors.yellow },
+    MasonHighlightSecondary = { fg = colors.yellow },
+    MasonLink = { fg = colors.aqua },
+    MasonMuted = { fg = colors.pink },
+    MasonMutedBlock = { fg = colors.dark_blue, bg = colors.light_gray },
+    MasonMutedBlockBold = { fg = colors.dark_blue, bg = colors.light_gray, bold = true },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/mini.lua b/lua/one_monokai/highlights/groups/mini.lua
new file mode 100644
index 0000000..da7ec9c
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/mini.lua
@@ -0,0 +1,116 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    MiniStatuslineDevinfo = { fg = colors.fg, bg = colors.vulcan },
+    MiniStatuslineFileinfo = { link = "MiniStatuslineDevinfo" },
+    MiniStatuslineFilename = { fg = colors.fg, bg = colors.black },
+    MiniStatuslineInactive = { link = "MiniStatuslineFilename" },
+    MiniStatuslineModeNormal = { fg = colors.dark_blue, bg = colors.green, bold = true },
+    MiniStatuslineModeInsert = { fg = colors.dark_blue, bg = colors.yellow, bold = true },
+    MiniStatuslineModeVisual = { fg = colors.dark_blue, bg = colors.purple, bold = true },
+    MiniStatuslineModeCommand = { fg = colors.dark_blue, bg = colors.aqua, bold = true },
+    MiniStatuslineModeReplace = { fg = colors.dark_blue, bg = colors.pink, bold = true },
+    MiniStatuslineModeOther = { fg = colors.dark_blue, bg = colors.green, bold = true },
+
+    MiniAnimateCursor = { reverse = true, nocombine = true },
+    MiniAnimateNormalFloat = { link = "NormalFloat" },
+
+    MiniClueBorder = { link = "FloatBorder" },
+    MiniClueDescGroup = { link = "DiagnosticWarn" },
+    MiniClueDescSingle = { link = "NormalFloat" },
+    MiniClueNextKey = { link = "DiagnosticHint" },
+    MiniClueNextKeyWithPostkeys = { link = "DiagnosticError" },
+    MiniClueSeparator = { link = "DiagnosticInfo" },
+    MiniClueTitle = { bg = colors.vulcan, bold = true },
+
+    MiniCompletionActiveParameter = { underline = true },
+
+    MiniCursorword = { underline = true },
+    MiniCursorwordCurrent = { underline = true },
+
+    MiniDiffOverAdd = { fg = colors.green, bg = colors.green, blend = 20 },
+    MiniDiffOverChange = { fg = colors.white, bg = colors.white, blend = 20 },
+    MiniDiffOverContext = { bg = colors.black },
+    MiniDiffOverDelete = { fg = colors.red, bg = colors.red, blend = 20 },
+    MiniDiffSignAdd = { fg = colors.green },
+    MiniDiffSignChange = { fg = colors.white },
+    MiniDiffSignDelete = { fg = colors.red },
+
+    MiniFilesBorder = { link = "FloatBorder" },
+    MiniFilesBorderModified = { link = "DiagnosticWarn" },
+    MiniFilesCursorLine = { link = "CursorLine" },
+    MiniFilesDirectory = { link = "Directory" },
+    MiniFilesFile = { fg = colors.fg },
+    MiniFilesNormal = { link = "NormalFloat" },
+    MiniFilesTitle = { link = "FloatTitle" },
+    MiniFilesTitleFocused = { fg = colors.pink, bg = colors.vulcan, bold = true },
+
+    MiniHipatternsFixme = { fg = colors.bg, bg = colors.red, bold = true },
+    MiniHipatternsHack = { fg = colors.bg, bg = colors.yellow, bold = true },
+    MiniHipatternsNote = { fg = colors.bg, bg = colors.cyan, bold = true },
+    MiniHipatternsTodo = { fg = colors.bg, bg = colors.aqua, bold = true },
+
+    MiniIndentscopeSymbol = { fg = colors.light_gray },
+    MiniIndentscopeSymbolOff = { fg = colors.yellow },
+
+    MiniJump = { sp = colors.yellow, undercurl = true },
+    MiniJump2dDim = { fg = colors.gray },
+    MiniJump2dSpot = { fg = colors.yellow, bold = true, nocombine = true },
+    MiniJump2dSpotAhead = { fg = colors.green, bg = colors.black, nocombine = true },
+    MiniJump2dSpotUnique = { fg = colors.pink, bold = true, nocombine = true },
+
+    MiniMapNormal = { link = "NormalFloat" },
+    MiniMapSymbolCount = { link = "Special" },
+    MiniMapSymbolLine = { link = "Title" },
+    MiniMapSymbolView = { link = "Delimiter" },
+
+    MiniNotifyBorder = { link = "FloatBorder" },
+    MiniNotifyNormal = { link = "NormalFloat" },
+    MiniNotifyTitle = { link = "FloatTitle" },
+
+    MiniOperatorsExchangeFrom = { link = "IncSearch" },
+
+    MiniPickBorder = { link = "FloatBorder" },
+    MiniPickBorderBusy = { link = "DiagnosticWarn" },
+    MiniPickBorderText = { bg = colors.vulcan },
+    MiniPickIconDirectory = { link = "Directory" },
+    MiniPickIconFile = { link = "NormalFloat" },
+    MiniPickHeader = { link = "DiagnosticHint" },
+    MiniPickMatchCurrent = { link = "CursorLine" },
+    MiniPickMatchMarked = { link = "Visual" },
+    MiniPickMatchRanges = { fg = colors.green },
+    MiniPickNormal = { link = "NormalFloat" },
+    MiniPickPreviewLine = { link = "CursorLine" },
+    MiniPickPreviewRegion = { link = "IncSearch" },
+    MiniPickPrompt = { bg = colors.vulcan, bold = true },
+
+    MiniStarterCurrent = { nocombine = true },
+    MiniStarterFooter = { fg = colors.gray },
+    MiniStarterHeader = { link = "Title" },
+    MiniStarterInactive = { link = "Comment" },
+    MiniStarterItem = { link = "Normal" },
+    MiniStarterItemBullet = { link = "Delimiter" },
+    MiniStarterItemPrefix = { link = "WarningMsg" },
+    MiniStarterSection = { fg = colors.pink },
+    MiniStarterQuery = { link = "MoreMsg" },
+
+    MiniSurround = { link = "IncSearch" },
+
+    MiniTablineCurrent = { fg = colors.fg, bg = colors.vulcan, bold = true },
+    MiniTablineFill = { link = "TabLineFill" },
+    MiniTablineHidden = { fg = colors.gray, bg = colors.vulcan },
+    MiniTablineModifiedCurrent = { fg = colors.vulcan, bg = colors.fg, bold = true },
+    MiniTablineModifiedHidden = { fg = colors.vulcan, bg = colors.gray },
+    MiniTablineModifiedVisible = { fg = colors.vulcan, bg = colors.fg },
+    MiniTablineTabpagesection = { link = "Search" },
+    MiniTablineVisible = { fg = colors.fg, bg = colors.vulcan },
+
+    MiniTestEmphasis = { bold = true },
+    MiniTestFail = { fg = colors.red, bold = true },
+    MiniTestPass = { fg = colors.green, bold = true },
+
+    MiniTrailspace = { bg = colors.red },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/nvim_cmp.lua b/lua/one_monokai/highlights/groups/nvim_cmp.lua
new file mode 100644
index 0000000..f424ae7
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/nvim_cmp.lua
@@ -0,0 +1,31 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    CmpItemAbbrDeprecated = { fg = colors.light_gray, strikethrough = true },
+    CmpItemAbbrMatch = { fg = colors.aqua },
+    CmpItemAbbrMatchFuzzy = { link = "CmpItemAbbrMatch" },
+    CmpItemKindClass = { fg = colors.pink },
+    CmpItemKindConstant = { fg = colors.cyan },
+    CmpItemKindConstructor = { link = "@constructor" },
+    CmpItemKindEnum = { fg = colors.cyan },
+    CmpItemKindEnumMember = { fg = colors.yellow },
+    CmpItemKindEvent = { fg = colors.yellow },
+    CmpItemKindField = { fg = colors.yellow },
+    CmpItemKindFile = { fg = colors.white },
+    CmpItemKindFolder = { fg = colors.yellow },
+    CmpItemKindFunction = { link = "Function" },
+    CmpItemKindInterface = { fg = colors.pink },
+    CmpItemKindKeyword = { fg = colors.white },
+    CmpItemKindMethod = { link = "Function" },
+    CmpItemKindModule = { fg = colors.pink },
+    CmpItemKindOperator = { link = "Operator" },
+    CmpItemKindProperty = { fg = colors.yellow },
+    CmpItemKindStruct = { fg = colors.pink },
+    CmpItemKindText = { fg = colors.white },
+    CmpItemKindUnit = { fg = colors.orange },
+    CmpItemKindValue = { fg = colors.white },
+    CmpItemKindVariable = { fg = colors.cyan },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/nvim_navic.lua b/lua/one_monokai/highlights/groups/nvim_navic.lua
new file mode 100644
index 0000000..3197e88
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/nvim_navic.lua
@@ -0,0 +1,35 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    NavicIconsArray = { link = "Type" },
+    NavicIconsBoolean = { link = "Boolean" },
+    NavicIconsClass = { link = "CmpItemKindClass" },
+    NavicIconsConstant = { link = "CmpItemKindConstant" },
+    NavicIconsConstructor = { link = "CmpItemKindConstructor" },
+    NavicIconsEnum = { link = "CmpItemKindEnum" },
+    NavicIconsEnumMember = { link = "CmpItemKindEnumMember" },
+    NavicIconsEvent = { link = "CmpItemKindEvent" },
+    NavicIconsField = { link = "CmpItemKindField" },
+    NavicIconsFile = { link = "CmpItemKindFile" },
+    NavicIconsFunction = { link = "CmpItemKindFunction" },
+    NavicIconsInterface = { link = "CmpItemKindInterface" },
+    NavicIconsKey = { link = "CmpItemKindValue" },
+    NavicIconsMethod = { link = "CmpItemKindMethod" },
+    NavicIconsModule = { link = "CmpItemKindModule" },
+    NavicIconsNamespace = { link = "CmpItemKindModule" },
+    NavicIconsNull = { link = "Constant" },
+    NavicIconsNumber = { link = "Number" },
+    NavicIconsObject = { link = "CmpItemKindProperty" },
+    NavicIconsOperator = { link = "CmpItemKindOperator" },
+    NavicIconsPackage = { link = "CmpItemKindModule" },
+    NavicIconsProperty = { link = "CmpItemKindProperty" },
+    NavicIconsString = { link = "String" },
+    NavicIconsStruct = { link = "CmpItemKindStruct" },
+    NavicIconsTypeParameter = { link = "CmpItemKindTypeParameter" },
+    NavicIconsVariable = { link = "CmpItemKindVariable" },
+    NavicSeparator = { fg = colors.aqua },
+    NavicText = { link = "Normal" },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/nvim_notify.lua b/lua/one_monokai/highlights/groups/nvim_notify.lua
new file mode 100644
index 0000000..1305e0b
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/nvim_notify.lua
@@ -0,0 +1,27 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    NotifyDEBUGBody = { fg = colors.fg },
+    NotifyDEBUGBorder = { fg = colors.purple },
+    NotifyDEBUGIcon = { fg = colors.purple },
+    NotifyDEBUGTitle = { fg = colors.purple },
+    NotifyERRORBody = { fg = colors.fg },
+    NotifyERRORBorder = { fg = colors.red },
+    NotifyERRORIcon = { fg = colors.red },
+    NotifyERRORTitle = { fg = colors.red },
+    NotifyINFOBody = { fg = colors.fg },
+    NotifyINFOBorder = { fg = colors.green },
+    NotifyINFOIcon = { fg = colors.green },
+    NotifyINFOTitle = { fg = colors.green },
+    NotifyTRACEBody = { fg = colors.fg },
+    NotifyTRACEBorder = { fg = colors.white },
+    NotifyTRACEIcon = { fg = colors.white },
+    NotifyTRACETitle = { fg = colors.white },
+    NotifyWARNBody = { fg = colors.fg },
+    NotifyWARNBorder = { fg = colors.yellow },
+    NotifyWARNIcon = { fg = colors.yellow },
+    NotifyWARNTitle = { fg = colors.yellow },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/nvimtree.lua b/lua/one_monokai/highlights/groups/nvimtree.lua
new file mode 100644
index 0000000..c839bb2
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/nvimtree.lua
@@ -0,0 +1,29 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    NvimTreeBookmark = { fg = colors.yellow },
+    NvimTreeEmptyFolderName = { link = "Directory" },
+    NvimTreeExecFile = { fg = colors.yellow, bold = true },
+    NvimTreeFolderIcon = { fg = colors.yellow },
+    NvimTreeFolderName = { link = "Directory" },
+    NvimTreeGitDeleted = { fg = colors.red },
+    NvimTreeGitDirty = { fg = colors.pink },
+    NvimTreeGitIgnored = { link = "Comment" },
+    NvimTreeGitMerge = { fg = colors.purple },
+    NvimTreeGitNew = { fg = colors.green },
+    NvimTreeGitRenamed = { fg = colors.pink },
+    NvimTreeGitStaged = { fg = colors.green },
+    NvimTreeImageFile = { fg = colors.purple, bold = true },
+    NvimTreeIndentMarker = { fg = colors.light_gray },
+    NvimTreeLiveFilterPrefix = { fg = colors.pink, bold = true },
+    NvimTreeLiveFilterValue = { bold = true },
+    NvimTreeOpenedFile = { fg = colors.yellow, bold = true },
+    NvimTreeOpenedFolderName = { link = "Directory" },
+    NvimTreeRootFolder = { fg = colors.pink },
+    NvimTreeSpecialFile = { fg = colors.green, bold = true, underline = true },
+    NvimTreeSymlink = { fg = colors.pink, bold = true },
+    NvimTreeWindowPicker = { fg = colors.white, bg = colors.aqua, bold = true },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/oil.lua b/lua/one_monokai/highlights/groups/oil.lua
new file mode 100644
index 0000000..5288bff
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/oil.lua
@@ -0,0 +1,12 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    OilFile = { link = "Normal" },
+    OilDir = { link = "Directory" },
+    OilDirIcon = { fg = colors.yellow },
+    OilLink = { fg = colors.pink, bold = true },
+    OilLinkTarget = { link = "OilLink" },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/rainbow_delimiters.lua b/lua/one_monokai/highlights/groups/rainbow_delimiters.lua
new file mode 100644
index 0000000..d5b12c3
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/rainbow_delimiters.lua
@@ -0,0 +1,14 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    RainbowDelimiterRed = { fg = colors.dark_red },
+    RainbowDelimiterOrange = { fg = colors.orange },
+    RainbowDelimiterYellow = { fg = colors.yellow },
+    RainbowDelimiterGreen = { fg = colors.green },
+    RainbowDelimiterBlue = { fg = colors.aqua },
+    RainbowDelimiterViolet = { fg = colors.purple },
+    RainbowDelimiterCyan = { fg = colors.cyan },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/sj.lua b/lua/one_monokai/highlights/groups/sj.lua
new file mode 100644
index 0000000..7cfa9e8
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/sj.lua
@@ -0,0 +1,12 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    SjLabel = { fg = colors.dark_pink },
+    SjLimit = { link = "ErrorMsg" },
+    SjOverlay = { link = "Comment" },
+    SjSearch = { link = "IncSearch" },
+    SjWarning = { link = "WarningMsg" },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/snacks.lua b/lua/one_monokai/highlights/groups/snacks.lua
new file mode 100644
index 0000000..ef0e0e5
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/snacks.lua
@@ -0,0 +1,68 @@
+local colors = require "one_monokai.colors"
+local config = require "one_monokai.config"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    SnacksNormal = { link = "NormalFloat" },
+    SnacksWinBar = { link = "Title" },
+    SnacksBackdrop = { fg = colors.vulcan },
+    SnacksNormalNC = { link = "NormalFloat" },
+    SnacksWinBarNC = { link = "SnacksWinBar" },
+
+    SnacksNotifierInfo = { fg = colors.green },
+    SnacksNotifierIconInfo = { fg = colors.green },
+    SnacksNotifierTitleInfo = { fg = colors.green, italic = true },
+    SnacksNotifierFooterInfo = { link = "DiagnosticInfo" },
+    SnacksNotifierBorderInfo = { fg = colors.green },
+
+    SnacksNotifierWarn = { fg = colors.yellow },
+    SnacksNotifierIconWarn = { fg = colors.yellow },
+    SnacksNotifierTitleWarn = { fg = colors.yellow, italic = true },
+    SnacksNotifierFooterWarn = { link = "DiagnosticWarn" },
+    SnacksNotifierBorderWarn = { fg = colors.yellow },
+
+    SnacksNotifierDebug = { fg = colors.orange },
+    SnacksNotifierIconDebug = { fg = colors.orange },
+    SnacksNotifierTitleDebug = { fg = colors.orange, italic = true },
+    SnacksNotifierFooterDebug = { link = "DiagnosticHint" },
+    SnacksNotifierBorderDebug = { fg = colors.orange },
+
+    SnacksNotifierError = { fg = colors.red },
+    SnacksNotifierIconError = { fg = colors.red },
+    SnacksNotifierTitleError = { fg = colors.red, italic = true },
+    SnacksNotifierFooterError = { link = "DiagnosticError" },
+    SnacksNotifierBorderError = { fg = colors.red },
+
+    SnacksNotifierTrace = { fg = colors.white },
+    SnacksNotifierIconTrace = { fg = colors.white },
+    SnacksNotifierTitleTrace = { fg = colors.white, italic = true },
+    SnacksNotifierFooterTrace = { link = "DiagnosticHint" },
+    SnacksNotifierBorderTrace = { fg = colors.white },
+
+    SnacksDashboardNormal = { link = "Normal" },
+    SnacksDashboardDesc = { fg = colors.green },
+    SnacksDashboardFile = { fg = colors.cyan },
+    SnacksDashboardDir = { link = "Nontext" },
+    SnacksDashboardFooter = { fg = colors.yellow, italic = true },
+    SnacksDashboardHeader = { fg = colors.green },
+    SnacksDashboardIcon = { fg = colors.pink, bold = true },
+    SnacksDashboardKey = { fg = colors.orange },
+    SnacksDashboardTerminal = { link = "SnacksDashboardNormal" },
+    SnacksDashboardSpecial = { link = "Special" },
+    SnacksDashboardTitle = { link = "Title" },
+
+    SnacksIndent = { fg = colors.dark_gray },
+    SnacksIndentScope = { fg = colors.light_gray },
+
+    SnacksPicker = { link = "NormalFloat" },
+    SnacksPickerInputBorder = { link = "SnacksPickerBorder" },
+    SnacksPickerBorder = { link = "FloatBorder" },
+    SnacksPickerSelected = {
+        fg = config.transparent and colors.pink or colors.fg,
+        bg = config.transparent and colors.none or colors.vulcan,
+        bold = true,
+    },
+    SnacksPickerMatch = { fg = colors.green },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/telescope.lua b/lua/one_monokai/highlights/groups/telescope.lua
new file mode 100644
index 0000000..3efaba7
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/telescope.lua
@@ -0,0 +1,11 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    TelescopeBorder = { link = "FloatBorder" },
+    TelescopeNormal = { link = "Normal" },
+    TelescopePromptCounter = { fg = colors.aqua },
+    TelescopeTitle = { fg = colors.aqua },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/treesitter.lua b/lua/one_monokai/highlights/groups/treesitter.lua
new file mode 100644
index 0000000..feb8915
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/treesitter.lua
@@ -0,0 +1,111 @@
+local colors = require "one_monokai.colors"
+local config = require "one_monokai.config"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    ["@variable"] = { fg = colors.fg },
+    ["@variable.builtin"] = { fg = colors.pink },
+    ["@variable.member"] = { link = "Identifier" },
+    ["@variable.parameter"] = { fg = colors.orange, italic = config.italics },
+    ["@variable.parameter.builtin"] = { link = "@variable.parameter" },
+
+    ["@constant"] = { link = "Constant" },
+    ["@constant.builtin"] = { fg = colors.aqua },
+    ["@constant.macro"] = { link = "Define" },
+
+    ["@module"] = { link = "Include" },
+    ["@module.builtin"] = { link = "@module" },
+    ["@label"] = { link = "Label" },
+
+    ["@string"] = { link = "String" },
+    ["@string.documentation"] = { fg = colors.cyan },
+    ["@string.regexp"] = { link = "String" },
+    ["@string.escape"] = { link = "SpecialChar" },
+    ["@string.special"] = { link = "Special" },
+    ["@string.special.symbol"] = { link = "Identifier" },
+    ["@string.special.url"] = { fg = colors.aqua, undercurl = true },
+    ["@string.special.path"] = { fg = colors.aqua, undercurl = true },
+
+    ["@character"] = { link = "Character" },
+    ["@character.special"] = { link = "SpecialChar" },
+
+    ["@boolean"] = { link = "Boolean" },
+    ["@number"] = { link = "Number" },
+    ["@number.float"] = { link = "Float" },
+
+    ["@type"] = { link = "Type" },
+    ["@type.builtin"] = { fg = colors.pink },
+    ["@type.definition"] = { link = "Typedef" },
+
+    ["@attribute"] = { link = "Type" },
+    ["@attribute.bultin"] = { link = "@attribute" },
+    ["@property"] = { link = "Identifier" },
+
+    ["@function"] = { link = "Function" },
+    ["@function.builtin"] = { link = "Function" },
+    ["@function.call"] = { link = "Function" },
+    ["@function.macro"] = { link = "Macro" },
+
+    ["@function.method"] = { link = "Function" },
+    ["@function.method.call"] = { link = "Function" },
+
+    ["@constructor"] = { fg = colors.aqua },
+    ["@operator"] = { link = "Operator" },
+
+    ["@keyword"] = { link = "Keyword" },
+    ["@keyword.coroutine"] = { link = "Keyword" },
+    ["@keyword.function"] = { fg = colors.pink },
+    ["@keyword.operator"] = { link = "Operator" },
+    ["@keyword.import"] = { link = "Include" },
+    ["@keyword.type"] = { link = "Type" },
+    ["@keyword.modifier"] = { fg = colors.pink },
+    ["@keyword.repeat"] = { link = "Repeat" },
+    ["@keyword.return"] = { fg = colors.pink },
+    ["@keyword.debug"] = { link = "Debug" },
+    ["@keyword.exception"] = { link = "Exception" },
+
+    ["@keyword.conditional"] = { link = "Conditional" },
+    ["@keyword.conditional.ternary"] = { link = "Conditional" },
+
+    ["@keyword.directive"] = { link = "PreProc" },
+    ["@keyword.directive.define"] = { link = "@keyword.directive" },
+
+    ["@punctuation.delimiter"] = { link = "Delimiter" },
+    ["@punctuation.bracket"] = { link = "Delimiter" },
+    ["@punctuation.special"] = { link = "Delimiter" },
+
+    ["@comment"] = { link = "Comment" },
+    ["@comment.error"] = { link = "ErrorMsg" },
+    ["@comment.hint"] = { link = "SpecialComment" },
+    ["@comment.todo"] = { link = "Todo" },
+    ["@comment.warning"] = { link = "WarningMsg" },
+
+    ["@markup.strong"] = { bold = true },
+    ["@markup.italic"] = { italic = true },
+    ["@markup.strikethrough"] = { strikethrough = true },
+    ["@markup.underline"] = { underline = true },
+
+    ["@markup.heading"] = { link = "Title" },
+
+    ["@markup.math"] = { link = "Special" },
+
+    ["@markup.link"] = { link = "Constant" },
+    ["@markup.link.label"] = { link = "SpecialChar" },
+    ["@markup.link.url"] = { fg = colors.aqua, undercurl = true },
+
+    ["@markup.raw"] = { link = "String" },
+
+    ["@markup.list"] = { link = "Delimiter" },
+    ["@markup.list.checked"] = { fg = colors.green },
+    ["@markup.list.unchecked"] = { fg = colors.pink },
+
+    ["@tag"] = { link = "Label" },
+    ["@tag.attribute"] = { link = "Identifier" },
+    ["@tag.delimiter"] = { link = "Delimiter" },
+
+    ["@none"] = {},
+
+    TreesitterContext = { bg = config.transparent and colors.bg:lighten(0.85) or colors.bg:darken(0.8) },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/vim_illuminate.lua b/lua/one_monokai/highlights/groups/vim_illuminate.lua
new file mode 100644
index 0000000..05b01e1
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/vim_illuminate.lua
@@ -0,0 +1,8 @@
+---@type one_monokai.highlights.groups
+local groups = {
+    IlluminatedWordRead = { link = "LspReferenceRead" },
+    IlluminatedWordText = { link = "LspReferenceText" },
+    IlluminatedWordWrite = { link = "LspReferenceWrite" },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/groups/whichkey.lua b/lua/one_monokai/highlights/groups/whichkey.lua
new file mode 100644
index 0000000..da20fdb
--- /dev/null
+++ b/lua/one_monokai/highlights/groups/whichkey.lua
@@ -0,0 +1,9 @@
+local colors = require "one_monokai.colors"
+
+---@type one_monokai.highlights.groups
+local groups = {
+    WhichKey = { fg = colors.yellow },
+    WhichKeySeparator = { fg = colors.pink },
+}
+
+return groups
diff --git a/lua/one_monokai/highlights/init.lua b/lua/one_monokai/highlights/init.lua
index 60e2d80..92a51db 100644
--- a/lua/one_monokai/highlights/init.lua
+++ b/lua/one_monokai/highlights/init.lua
@@ -8,9 +8,9 @@ local function set_highlight(groups)
     local set_hl = vim.api.nvim_set_hl
 
     for name, attrs in pairs(groups) do
-        local status_ok, err = pcall(set_hl, 0, name, attrs)
+        local ok, err = pcall(set_hl, 0, name, attrs)
 
-        if not status_ok then
+        if not ok then
             logs.error("highlights(%s): %s", name, err)
         end
     end
@@ -18,15 +18,24 @@ end
 
 ---Load all highlight groups.
 function highlights.load()
-    local config = require "one_monokai.config"
-    local default = require "one_monokai.highlights.groups"
+    -- Core groups should be loaded first to prevent screen flickering.
+    local core_groups = require "one_monokai.highlights.groups.core"
+    set_highlight(core_groups)
 
-    set_highlight(default)
+    ---@type uv.uv_async_t?
+    local async = nil
 
-    if config.highlights then
-        local colors = require "one_monokai.colors"
+    async = vim.uv.new_async(vim.schedule_wrap(function()
+        local groups = require "one_monokai.highlights.groups"
+        set_highlight(groups)
 
-        set_highlight(config.highlights(colors))
+        if async ~= nil then
+            async:close()
+        end
+    end))
+
+    if async ~= nil then
+        async:send()
     end
 end
 
diff --git a/tests/color_spec.lua b/tests/color_spec.lua
index 72add69..b155e56 100644
--- a/tests/color_spec.lua
+++ b/tests/color_spec.lua
@@ -15,9 +15,11 @@ describe("Override config with color utility", function()
 
         one_monokai.setup(expected)
 
-        local hl = vim.api.nvim_get_hl(0, { name = "Normal" })
+        vim.schedule(function()
+            local hl = vim.api.nvim_get_hl(0, { name = "Normal" })
 
-        assert.equal("#41143a", ("#%06x"):format(hl.fg))
+            assert.equal("#41143a", ("#%06x"):format(hl.fg))
+        end)
     end)
 
     it("could use lighten utility", function()
@@ -34,8 +36,10 @@ describe("Override config with color utility", function()
 
         one_monokai.setup(expected)
 
-        local hl = vim.api.nvim_get_hl(0, { name = "Normal" })
+        vim.schedule(function()
+            local hl = vim.api.nvim_get_hl(0, { name = "Normal" })
 
-        assert.equal("#c094b9", ("#%06x"):format(hl.fg))
+            assert.equal("#c094b9", ("#%06x"):format(hl.fg))
+        end)
     end)
 end)
diff --git a/tests/config_spec.lua b/tests/config_spec.lua
index fb88ff8..69f3ab9 100644
--- a/tests/config_spec.lua
+++ b/tests/config_spec.lua
@@ -43,10 +43,12 @@ describe("Override config", function()
     end)
 
     it("should change default highlights", function()
-        local hl = vim.api.nvim_get_hl(0, { name = "Normal" })
+        vim.schedule(function()
+            local hl = vim.api.nvim_get_hl(0, { name = "Normal" })
 
-        assert.equal(expected.colors.lmao, ("#%06x"):format(hl.fg))
-        assert.is_true(hl.italic)
+            assert.equal(expected.colors.lmao, ("#%06x"):format(hl.fg))
+            assert.is_true(hl.italic)
+        end)
     end)
 
     it("should disable all italics", function()
@@ -83,10 +85,12 @@ describe("Override wrong config", function()
     end)
 
     it("should fallback to default highlights", function()
-        local default = require "one_monokai.highlights.groups"
-        local hl = vim.api.nvim_get_hl(0, { name = "Normal" })
+        vim.schedule(function()
+            local default = require "one_monokai.highlights.groups"
+            local hl = vim.api.nvim_get_hl(0, { name = "Normal" })
 
-        assert.equal(default.Normal.fg, ("#%06x"):format(hl.fg))
-        assert.is_nil(hl.italic)
+            assert.equal(default.Normal.fg, ("#%06x"):format(hl.fg))
+            assert.is_nil(hl.italic)
+        end)
     end)
 end)