lots of highlight fixes

- adding missing language highlights
- removing old vimscript plugins highlight support
- improving lspsaga.nvim highlights

1 files changed, 405 insertions, 312 deletions

diff --git a/lua/gruvbox/groups.lua b/lua/gruvbox/groups.lua
index 325abaf..2d8c54d 100644
--- a/lua/gruvbox/groups.lua
+++ b/lua/gruvbox/groups.lua
@@ -139,108 +139,250 @@ groups.setup = function()
     GruvboxPurpleUnderline = { undercurl = config.undercurl, sp = colors.purple },
     GruvboxAquaUnderline = { undercurl = config.undercurl, sp = colors.aqua },
     GruvboxOrangeUnderline = { undercurl = config.undercurl, sp = colors.orange },
-    ColorColumn = { bg = colors.bg1 },
-    Conceal = { fg = colors.blue },
-    Cursor = { reverse = config.inverse },
-    lCursor = { link = "Cursor" },
-    iCursor = { link = "Cursor" },
-    vCursor = { link = "Cursor" },
-    CursorIM = { link = "Cursor" },
+    Normal = { fg = colors.fg1, bg = colors.bg0 },
     CursorLine = { bg = colors.bg1 },
     CursorColumn = { link = "CursorLine" },
-    Directory = { link = "GruvboxGreenBold" },
-    DiffAdd = { fg = colors.green, bg = colors.bg0, reverse = config.inverse },
-    DiffChange = { fg = colors.aqua, bg = colors.bg0, reverse = config.inverse },
-    DiffDelete = { fg = colors.red, bg = colors.bg0, reverse = config.inverse },
-    DiffText = { fg = colors.yellow, bg = colors.bg0, reverse = config.inverse },
-    ErrorMsg = { fg = colors.bg0, bg = colors.red, bold = config.bold },
-    VertSplit = { fg = colors.bg3, bg = colors.bg0 },
-    Folded = { fg = colors.gray, bg = colors.bg1, italic = config.italic },
-    FoldColumn = { fg = colors.gray, bg = colors.bg1 },
-    SignColumn = { bg = colors.bg1 },
-    IncSearch = { fg = colors.orange, bg = colors.bg0, reverse = config.inverse },
-    LineNr = { fg = colors.bg4 },
-    CursorLineNr = { fg = colors.yellow, bg = colors.bg1 },
+    TabLineFill = { fg = colors.bg4, bg = colors.bg1, reverse = config.invert_tabline },
+    TabLineSel = { fg = colors.green, bg = colors.bg1, reverse = config.invert_tabline },
+    TabLine = { link = "TabLineFill" },
     MatchParen = { bg = colors.bg3, bold = config.bold },
-    ModeMsg = { link = "GruvboxYellowBold" },
-    MoreMsg = { link = "GruvboxYellowBold" },
+    ColorColumn = { bg = colors.bg1 },
+    Conceal = { fg = colors.blue },
+    CursorLineNr = { fg = colors.yellow, bg = colors.bg1 },
     NonText = { link = "GruvboxBg2" },
-    Normal = { fg = colors.fg1, bg = colors.bg0 },
-    Pmenu = { fg = colors.fg1, bg = colors.bg2 },
-    PmenuSel = { fg = colors.bg2, bg = colors.blue, bold = config.bold },
-    PmenuSbar = { bg = colors.bg2 },
-    PmenuThumb = { bg = colors.bg4 },
-    Question = { link = "GruvboxOrangeBold" },
-    QuickFixLine = { bg = colors.bg0, bold = config.bold },
-    Search = { fg = colors.yellow, bg = colors.bg0, reverse = config.inverse },
-    CurSearch = { link = "IncSearch" },
     SpecialKey = { link = "GruvboxFg4" },
-    SpellRare = { link = "GruvboxPurpleUnderline" },
-    SpellBad = { link = "GruvboxRedUnderline" },
-    SpellLocal = { link = "GruvboxAquaUnderline" },
-    SpellCap = { link = "GruvboxBlueUnderline" },
+    Visual = { bg = colors.bg3, reverse = config.invert_selection },
+    VisualNOS = { link = "Visual" },
+    Search = { fg = colors.yellow, bg = colors.bg0, reverse = config.inverse },
+    IncSearch = { fg = colors.orange, bg = colors.bg0, reverse = config.inverse },
+    QuickFixLine = { fg = colors.bg0, bg = colors.yellow, bold = config.bold },
+    Underlined = { fg = colors.blue, underline = config.underline },
     StatusLine = { fg = colors.bg2, bg = colors.fg1, reverse = config.inverse },
     StatusLineNC = { fg = colors.bg1, bg = colors.fg4, reverse = config.inverse },
-    TabLineFill = { fg = colors.bg4, bg = colors.bg1, reverse = config.invert_tabline },
-    TabLine = { link = "TabLineFill" },
-    TabLineSel = { fg = colors.green, bg = colors.bg1, reverse = config.invert_tabline },
+    VertSplit = { fg = colors.bg3, bg = colors.bg0 },
+    WildMenu = { fg = colors.blue, bg = colors.bg2, bold = config.bold },
+    Directory = { link = "GruvboxGreenBold" },
     Title = { link = "GruvboxGreenBold" },
-    Visual = { bg = colors.bg3, reverse = config.invert_selection },
-    VisualNOS = { link = "Visual" },
+    ErrorMsg = { fg = colors.bg0, bg = colors.red, bold = config.bold },
+    MoreMsg = { link = "GruvboxYellowBold" },
+    ModeMsg = { link = "GruvboxYellowBold" },
+    Question = { link = "GruvboxOrangeBold" },
     WarningMsg = { link = "GruvboxRedBold" },
-    WildMenu = { fg = colors.blue, bg = colors.bg2, bold = config.bold },
-    Constant = { link = "GruvboxPurple" },
+    LineNr = { fg = colors.bg4 },
+    SignColumn = { bg = colors.bg1 },
+    Folded = { fg = colors.gray, bg = colors.bg1, italic = config.italic },
+    FoldColumn = { fg = colors.gray, bg = colors.bg1 },
+    Cursor = { reverse = config.inverse },
+    vCursor = { link = "Cursor" },
+    iCursor = { link = "Cursor" },
+    lCursor = { link = "Cursor" },
     Special = { link = "GruvboxOrange" },
-    String = { fg = colors.green, italic = config.italic },
-    Character = { link = "GruvboxPurple" },
-    Number = { link = "GruvboxPurple" },
-    Boolean = { link = "GruvboxPurple" },
-    Float = { link = "GruvboxPurple" },
-    Identifier = { link = "GruvboxBlue" },
-    Function = { link = "GruvboxGreenBold" },
+    Comment = { fg = colors.gray, italic = config.italic },
+    Todo = { fg = colors.fg0, bold = config.bold, italic = config.italic },
+    Error = { fg = colors.red, bold = config.bold, reverse = config.inverse },
     Statement = { link = "GruvboxRed" },
     Conditional = { link = "GruvboxRed" },
     Repeat = { link = "GruvboxRed" },
     Label = { link = "GruvboxRed" },
     Exception = { link = "GruvboxRed" },
+    Operator = { fg = colors.orange, italic = config.italic },
     Keyword = { link = "GruvboxRed" },
-    Operator = { link = "GruvboxFg1" },
+    Identifier = { link = "GruvboxBlue" },
+    Function = { link = "GruvboxGreenBold" },
     PreProc = { link = "GruvboxAqua" },
     Include = { link = "GruvboxAqua" },
     Define = { link = "GruvboxAqua" },
     Macro = { link = "GruvboxAqua" },
     PreCondit = { link = "GruvboxAqua" },
+    Constant = { link = "GruvboxPurple" },
+    Character = { link = "GruvboxPurple" },
+    String = { fg = colors.green, italic = config.italic },
+    Boolean = { link = "GruvboxPurple" },
+    Number = { link = "GruvboxPurple" },
+    Float = { link = "GruvboxPurple" },
     Type = { link = "GruvboxYellow" },
     StorageClass = { link = "GruvboxOrange" },
     Structure = { link = "GruvboxAqua" },
     Typedef = { link = "GruvboxYellow" },
-    SpecialChar = { link = "GruvboxRed" },
-    Tag = { link = "GruvboxAquaBold" },
-    Delimiter = { link = "GruvboxFg3" },
-    Comment = { fg = colors.gray, italic = config.italic },
-    Debug = { link = "GruvboxRed" },
-    Underlined = { fg = colors.blue, underline = config.underline },
-    Bold = { bold = config.bold },
-    Italic = { italic = config.italic },
-    Ignore = {},
-    Error = { fg = colors.red, bold = config.bold, reverse = config.inverse },
-    Todo = { fg = colors.fg0, bold = config.bold, italic = config.italic },
+    Pmenu = { fg = colors.fg1, bg = colors.bg2 },
+    PmenuSel = { fg = colors.bg2, bg = colors.blue, bold = config.bold },
+    PmenuSbar = { bg = colors.bg2 },
+    PmenuThumb = { bg = colors.bg4 },
+    DiffDelete = { fg = colors.red, bg = colors.bg0, reverse = config.inverse },
+    DiffAdd = { fg = colors.green, bg = colors.bg0, reverse = config.inverse },
+    DiffChange = { fg = colors.aqua, bg = colors.bg0, reverse = config.inverse },
+    DiffText = { fg = colors.yellow, bg = colors.bg0, reverse = config.inverse },
+    SpellCap = { link = "GruvboxBlueUnderline" },
+    SpellBad = { link = "GruvboxRedUnderline" },
+    SpellLocal = { link = "GruvboxAquaUnderline" },
+    SpellRare = { link = "GruvboxPurpleUnderline" },
+    -- LSP Diagnostic
+    DiagnosticError = { link = "GruvboxRed" },
+    DiagnosticSignError = { link = "GruvboxRedSign" },
+    DiagnosticUnderlineError = { link = "GruvboxRedUnderline" },
+    DiagnosticWarn = { link = "GruvboxYellow" },
+    DiagnosticSignWarn = { link = "GruvboxYellowSign" },
+    DiagnosticUnderlineWarn = { link = "GruvboxYellowUnderline" },
+    DiagnosticInfo = { link = "GruvboxBlue" },
+    DiagnosticSignInfo = { link = "GruvboxBlueSign" },
+    DiagnosticUnderlineInfo = { link = "GruvboxBlueUnderline" },
+    DiagnosticHint = { link = "GruvboxAqua" },
+    DiagnosticSignHint = { link = "GruvboxAquaSign" },
+    DiagnosticUnderlineHint = { link = "GruvboxAquaUnderline" },
+    DiagnosticFloatingError = { link = "GruvboxRed" },
+    DiagnosticFloatingWarn = { link = "GruvboxOrange" },
+    DiagnosticFloatingInfo = { link = "GruvboxBlue" },
+    DiagnosticFloatingHint = { link = "GruvboxAqua" },
+    DiagnosticVirtualTextError = { link = "GruvboxRed" },
+    DiagnosticVirtualTextWarn = { link = "GruvboxYellow" },
+    DiagnosticVirtualTextInfo = { link = "GruvboxBlue" },
+    DiagnosticVirtualTextHint = { link = "GruvboxAqua" },
+    LspReferenceRead = { link = "GruvboxYellowBold" },
+    LspReferenceText = { link = "GruvboxYellowBold" },
+    LspReferenceWrite = { link = "GruvboxOrangeBold" },
+    LspCodeLens = { link = "GruvboxGray" },
+    -- nvim-treesitter
+    TSStrong = { bold = config.bold },
+    TSStrike = { strikethrough = config.strikethrough },
+    TSEmphasis = { italic = config.italic },
+    TSUnderline = { underline = config.underline },
+    TSKeywordOperator = { link = "GruvboxRed" },
+    -- gitcommit
+    gitcommitSelectedFile = { link = "GruvboxGreen" },
+    gitcommitDiscardedFile = { link = "GruvboxRed" },
+    -- gitsigns.nvim
+    GitSignsAdd = { link = "GruvboxGreenSign" },
+    GitSignsChange = { link = "GruvboxAquaSign" },
+    GitSignsDelete = { link = "GruvboxRedSign" },
+    -- termdebug
+    debugPC = { bg = colors.faded_blue },
+    debugBreakpoint = { link = "GruvboxRedSign" },
+    -- vim-startify
+    StartifyBracket = { link = "GruvboxFg3" },
+    StartifyFile = { link = "GruvboxFg1" },
+    StartifyNumber = { link = "GruvboxBlue" },
+    StartifyPath = { link = "GruvboxGray" },
+    StartifySlash = { link = "GruvboxGray" },
+    StartifySection = { link = "GruvboxYellow" },
+    StartifySpecial = { link = "GruvboxBg2" },
+    StartifyHeader = { link = "GruvboxOrange" },
+    StartifyFooter = { link = "GruvboxBg2" },
+    StartifyVar = { link = "StartifyPath" },
+    StartifySelect = { link = "Title" },
+    -- vim-dirvish
+    DirvishPathTail = { link = "GruvboxAqua" },
+    DirvishArg = { link = "GruvboxYellow" },
+    -- netrw
+    netrwDir = { link = "GruvboxAqua" },
+    netrwClassify = { link = "GruvboxAqua" },
+    netrwLink = { link = "GruvboxGray" },
+    netrwSymLink = { link = "GruvboxFg1" },
+    netrwExe = { link = "GruvboxYellow" },
+    netrwComment = { link = "GruvboxGray" },
+    netrwList = { link = "GruvboxBlue" },
+    netrwHelpCmd = { link = "GruvboxAqua" },
+    netrwCmdSep = { link = "GruvboxFg3" },
+    netrwVersion = { link = "GruvboxGreen" },
+    -- nerdtree
+    NERDTreeDir = { link = "GruvboxAqua" },
+    NERDTreeDirSlash = { link = "GruvboxAqua" },
+    NERDTreeOpenable = { link = "GruvboxOrange" },
+    NERDTreeClosable = { link = "GruvboxOrange" },
+    NERDTreeFile = { link = "GruvboxFg1" },
+    NERDTreeExecFile = { link = "GruvboxYellow" },
+    NERDTreeUp = { link = "GruvboxGray" },
+    NERDTreeCWD = { link = "GruvboxGreen" },
+    NERDTreeHelp = { link = "GruvboxFg1" },
+    NERDTreeToggleOn = { link = "GruvboxGreen" },
+    NERDTreeToggleOff = { link = "GruvboxRed" },
+    -- coc.nvim
+    CocErrorSign = { link = "GruvboxRedSign" },
+    CocWarningSign = { link = "GruvboxOrangeSign" },
+    CocInfoSign = { link = "GruvboxBlueSign" },
+    CocHintSign = { link = "GruvboxAquaSign" },
+    CocErrorFloat = { link = "GruvboxRed" },
+    CocWarningFloat = { link = "GruvboxOrange" },
+    CocInfoFloat = { link = "GruvboxBlue" },
+    CocHintFloat = { link = "GruvboxAqua" },
+    CocDiagnosticsError = { link = "GruvboxRed" },
+    CocDiagnosticsWarning = { link = "GruvboxOrange" },
+    CocDiagnosticsInfo = { link = "GruvboxBlue" },
+    CocDiagnosticsHint = { link = "GruvboxAqua" },
+    CocSelectedText = { link = "GruvboxRed" },
+    CocCodeLens = { link = "GruvboxGray" },
+    CocErrorHighlight = { link = "GruvboxRedUnderline" },
+    CocWarningHighlight = { link = "GruvboxOrangeUnderline" },
+    CocInfoHighlight = { link = "GruvboxBlueUnderline" },
+    CocHintHighlight = { link = "GruvboxAquaUnderline" },
+    -- telescope.nvim
+    TelescopeNormal = { link = "GruvboxFg1" },
+    TelescopeSelection = { link = "GruvboxOrangeBold" },
+    TelescopeSelectionCaret = { link = "GruvboxRed" },
+    TelescopeMultiSelection = { link = "GruvboxGray" },
+    TelescopeBorder = { link = "TelescopeNormal" },
+    TelescopePromptBorder = { link = "TelescopeNormal" },
+    TelescopeResultsBorder = { link = "TelescopeNormal" },
+    TelescopePreviewBorder = { link = "TelescopeNormal" },
+    TelescopeMatching = { link = "GruvboxBlue" },
+    TelescopePromptPrefix = { link = "GruvboxRed" },
+    TelescopePrompt = { link = "TelescopeNormal" },
+    -- nvim-cmp
+    CmpItemAbbr = { link = "GruvboxFg0" },
+    CmpItemAbbrDeprecated = { link = "GruvboxFg1" },
+    CmpItemAbbrMatch = { link = "GruvboxBlueBold" },
+    CmpItemAbbrMatchFuzzy = { link = "GruvboxBlueUnderline" },
+    CmpItemMenu = { link = "GruvboxGray" },
+    CmpItemKindText = { link = "GruvboxOrange" },
+    CmpItemKindMethod = { link = "GruvboxBlue" },
+    CmpItemKindFunction = { link = "GruvboxBlue" },
+    CmpItemKindConstructor = { link = "GruvboxYellow" },
+    CmpItemKindField = { link = "GruvboxBlue" },
+    CmpItemKindClass = { link = "GruvboxYellow" },
+    CmpItemKindInterface = { link = "GruvboxYellow" },
+    CmpItemKindModule = { link = "GruvboxBlue" },
+    CmpItemKindProperty = { link = "GruvboxBlue" },
+    CmpItemKindValue = { link = "GruvboxOrange" },
+    CmpItemKindEnum = { link = "GruvboxYellow" },
+    CmpItemKindKeyword = { link = "GruvboxPurple" },
+    CmpItemKindSnippet = { link = "GruvboxGreen" },
+    CmpItemKindFile = { link = "GruvboxBlue" },
+    CmpItemKindEnumMember = { link = "GruvboxAqua" },
+    CmpItemKindConstant = { link = "GruvboxOrange" },
+    CmpItemKindStruct = { link = "GruvboxYellow" },
+    CmpItemKindTypeParameter = { link = "GruvboxYellow" },
     diffAdded = { link = "GruvboxGreen" },
     diffRemoved = { link = "GruvboxRed" },
     diffChanged = { link = "GruvboxAqua" },
     diffFile = { link = "GruvboxOrange" },
     diffNewFile = { link = "GruvboxYellow" },
     diffLine = { link = "GruvboxBlue" },
-    -- signature
-    SignatureMarkText = { link = "GruvboxBlueSign" },
-    SignatureMarkerText = { link = "GruvboxPurpleSign" },
-    -- gitcommit
-    gitcommitSelectedFile = { link = "GruvboxGreen" },
-    gitcommitDiscardedFile = { link = "GruvboxRed" },
-    -- checkhealth
-    healthError = { fg = colors.bg0, bg = colors.red },
-    healthSuccess = { fg = colors.bg0, bg = colors.green },
-    healthWarning = { fg = colors.bg0, bg = colors.yellow },
+    -- html
+    htmlTag = { link = "GruvboxAquaBold" },
+    htmlEndTag = { link = "GruvboxAquaBold" },
+    htmlTagName = { link = "GruvboxBlue" },
+    htmlArg = { link = "GruvboxOrange" },
+    htmlTagN = { link = "GruvboxFg1" },
+    htmlSpecialTagName = { link = "GruvboxBlue" },
+    htmlLink = { fg = colors.fg4, underline = config.underline },
+    htmlSpecialChar = { link = "GruvboxRed" },
+    htmlBold = { fg = colors.fg0, bg = colors.bg0, bold = config.bold },
+    htmlBoldUnderline = { fg = colors.fg0, bg = colors.bg0, bold = config.bold, underline = config.underline },
+    htmlBoldItalic = { fg = colors.fg0, bg = colors.bg0, bold = config.bold, italic = config.italic },
+    htmlBoldUnderlineItalic = {
+      fg = colors.fg0,
+      bg = colors.bg0,
+      bold = config.bold,
+      italic = config.italic,
+      underline = config.underline,
+    },
+    htmlUnderline = { fg = colors.fg0, bg = colors.bg0, underline = config.underline },
+    htmlUnderlineItalic = {
+      fg = colors.fg0,
+      bg = colors.bg0,
+      italic = config.italic,
+      underline = config.underline,
+    },
+    htmlItalic = { fg = colors.fg0, bg = colors.bg0, bold = config.italic },
     -- xml
     xmlTag = { link = "GruvboxAquaBold" },
     xmlEndTag = { link = "GruvboxAquaBold" },
@@ -260,6 +402,109 @@ groups.setup = function()
     xmlAttribPunct = { link = "GruvboxGray" },
     xmlEntity = { link = "GruvboxRed" },
     xmlEntityPunct = { link = "GruvboxRed" },
+    -- clojure
+    clojureKeyword = { link = "GruvboxBlue" },
+    clojureCond = { link = "GruvboxOrange" },
+    clojureSpecial = { link = "GruvboxOrange" },
+    clojureDefine = { link = "GruvboxOrange" },
+    clojureFunc = { link = "GruvboxYellow" },
+    clojureRepeat = { link = "GruvboxYellow" },
+    clojureCharacter = { link = "GruvboxAqua" },
+    clojureStringEscape = { link = "GruvboxAqua" },
+    clojureException = { link = "GruvboxRed" },
+    clojureRegexp = { link = "GruvboxAqua" },
+    clojureRegexpEscape = { link = "GruvboxAqua" },
+    clojureRegexpCharClass = { fg = colors.fg3, bold = config.bold },
+    clojureRegexpMod = { link = "clojureRegexpCharClass" },
+    clojureRegexpQuantifier = { link = "clojureRegexpCharClass" },
+    clojureParen = { link = "GruvboxFg3" },
+    clojureAnonArg = { link = "GruvboxYellow" },
+    clojureVariable = { link = "GruvboxBlue" },
+    clojureMacro = { link = "GruvboxOrange" },
+    clojureMeta = { link = "GruvboxYellow" },
+    clojureDeref = { link = "GruvboxYellow" },
+    clojureQuote = { link = "GruvboxYellow" },
+    clojureUnquote = { link = "GruvboxYellow" },
+    -- C
+    cOperator = { link = "GruvboxPurple" },
+    cppOperator = { link = "GruvboxPurple" },
+    cStructure = { link = "GruvboxOrange" },
+    -- python
+    pythonBuiltin = { link = "GruvboxOrange" },
+    pythonBuiltinObj = { link = "GruvboxOrange" },
+    pythonBuiltinFunc = { link = "GruvboxOrange" },
+    pythonFunction = { link = "GruvboxAqua" },
+    pythonDecorator = { link = "GruvboxRed" },
+    pythonInclude = { link = "GruvboxBlue" },
+    pythonImport = { link = "GruvboxBlue" },
+    pythonRun = { link = "GruvboxBlue" },
+    pythonCoding = { link = "GruvboxBlue" },
+    pythonOperator = { link = "GruvboxRed" },
+    pythonException = { link = "GruvboxRed" },
+    pythonExceptions = { link = "GruvboxPurple" },
+    pythonBoolean = { link = "GruvboxPurple" },
+    pythonDot = { link = "GruvboxFg3" },
+    pythonConditional = { link = "GruvboxRed" },
+    pythonRepeat = { link = "GruvboxRed" },
+    pythonDottedName = { link = "GruvboxGreenBold" },
+    -- CSS
+    cssBraces = { link = "GruvboxBlue" },
+    cssFunctionName = { link = "GruvboxYellow" },
+    cssIdentifier = { link = "GruvboxOrange" },
+    cssClassName = { link = "GruvboxGreen" },
+    cssColor = { link = "GruvboxBlue" },
+    cssSelectorOp = { link = "GruvboxBlue" },
+    cssSelectorOp2 = { link = "GruvboxBlue" },
+    cssImportant = { link = "GruvboxGreen" },
+    cssVendor = { link = "GruvboxFg1" },
+    cssTextProp = { link = "GruvboxAqua" },
+    cssAnimationProp = { link = "GruvboxAqua" },
+    cssUIProp = { link = "GruvboxYellow" },
+    cssTransformProp = { link = "GruvboxAqua" },
+    cssTransitionProp = { link = "GruvboxAqua" },
+    cssPrintProp = { link = "GruvboxAqua" },
+    cssPositioningProp = { link = "GruvboxYellow" },
+    cssBoxProp = { link = "GruvboxAqua" },
+    cssFontDescriptorProp = { link = "GruvboxAqua" },
+    cssFlexibleBoxProp = { link = "GruvboxAqua" },
+    cssBorderOutlineProp = { link = "GruvboxAqua" },
+    cssBackgroundProp = { link = "GruvboxAqua" },
+    cssMarginProp = { link = "GruvboxAqua" },
+    cssListProp = { link = "GruvboxAqua" },
+    cssTableProp = { link = "GruvboxAqua" },
+    cssFontProp = { link = "GruvboxAqua" },
+    cssPaddingProp = { link = "GruvboxAqua" },
+    cssDimensionProp = { link = "GruvboxAqua" },
+    cssRenderProp = { link = "GruvboxAqua" },
+    cssColorProp = { link = "GruvboxAqua" },
+    cssGeneratedContentProp = { link = "GruvboxAqua" },
+    -- javascript
+    javaScriptBraces = { link = "GruvboxFg1" },
+    javaScriptFunction = { link = "GruvboxAqua" },
+    javaScriptIdentifier = { link = "GruvboxRed" },
+    javaScriptMember = { link = "GruvboxBlue" },
+    javaScriptNumber = { link = "GruvboxPurple" },
+    javaScriptNull = { link = "GruvboxPurple" },
+    javaScriptParens = { link = "GruvboxFg3" },
+    -- typescript
+    typescriptReserved = { link = "GruvboxAqua" },
+    typescriptLabel = { link = "GruvboxAqua" },
+    typescriptFuncKeyword = { link = "GruvboxAqua" },
+    typescriptIdentifier = { link = "GruvboxOrange" },
+    typescriptBraces = { link = "GruvboxFg1" },
+    typescriptEndColons = { link = "GruvboxFg1" },
+    typescriptDOMObjects = { link = "GruvboxFg1" },
+    typescriptAjaxMethods = { link = "GruvboxFg1" },
+    typescriptLogicSymbols = { link = "GruvboxFg1" },
+    typescriptDocSeeTag = { link = "Comment" },
+    typescriptDocParam = { link = "Comment" },
+    typescriptDocTags = { link = "vimCommentTitle" },
+    typescriptGlobalObjects = { link = "GruvboxFg1" },
+    typescriptParens = { link = "GruvboxFg3" },
+    typescriptOpSymbols = { link = "GruvboxFg3" },
+    typescriptHtmlElemProperties = { link = "GruvboxFg1" },
+    typescriptNull = { link = "GruvboxPurple" },
+    typescriptInterpolationDelimiter = { link = "GruvboxAqua" },
     -- purescript
     purescriptModuleKeyword = { link = "GruvboxAqua" },
     purescriptModuleName = { link = "GruvboxFg1" },
@@ -282,29 +527,68 @@ groups.setup = function()
     coffeeCurly = { link = "GruvboxOrange" },
     coffeeParen = { link = "GruvboxFg3" },
     coffeeBracket = { link = "GruvboxOrange" },
+    -- ruby
+    rubyStringDelimiter = { link = "GruvboxGreen" },
+    rubyInterpolationDelimiter = { link = "GruvboxAqua" },
+    rubyDefinedOperator = { link = "rubyKeyword" },
     -- objc
     objcTypeModifier = { link = "GruvboxRed" },
     objcDirective = { link = "GruvboxBlue" },
+    -- go
+    goDirective = { link = "GruvboxAqua" },
+    goConstants = { link = "GruvboxPurple" },
+    goDeclaration = { link = "GruvboxRed" },
+    goDeclType = { link = "GruvboxBlue" },
+    goBuiltins = { link = "GruvboxOrange" },
+    -- lua
+    luaIn = { link = "GruvboxRed" },
+    luaFunction = { link = "GruvboxAqua" },
+    luaTable = { link = "GruvboxOrange" },
     -- moonscript
     moonSpecialOp = { link = "GruvboxFg3" },
     moonExtendedOp = { link = "GruvboxFg3" },
     moonFunction = { link = "GruvboxFg3" },
     moonObject = { link = "GruvboxYellow" },
+    -- java
+    javaAnnotation = { link = "GruvboxBlue" },
+    javaDocTags = { link = "GruvboxAqua" },
+    javaCommentTitle = { link = "vimCommentTitle" },
+    javaParen = { link = "GruvboxFg3" },
+    javaParen1 = { link = "GruvboxFg3" },
+    javaParen2 = { link = "GruvboxFg3" },
+    javaParen3 = { link = "GruvboxFg3" },
+    javaParen4 = { link = "GruvboxFg3" },
+    javaParen5 = { link = "GruvboxFg3" },
+    javaOperator = { link = "GruvboxOrange" },
+    javaVarArg = { link = "GruvboxGreen" },
     -- elixir
     elixirDocString = { link = "Comment" },
     elixirStringDelimiter = { link = "GruvboxGreen" },
     elixirInterpolationDelimiter = { link = "GruvboxAqua" },
     elixirModuleDeclaration = { link = "GruvboxYellow" },
+    -- scala
+    scalaNameDefinition = { link = "GruvboxFg1" },
+    scalaCaseFollowing = { link = "GruvboxFg1" },
+    scalaCapitalWord = { link = "GruvboxFg1" },
+    scalaTypeExtension = { link = "GruvboxFg1" },
+    scalaKeyword = { link = "GruvboxRed" },
+    scalaKeywordModifier = { link = "GruvboxRed" },
+    scalaSpecial = { link = "GruvboxAqua" },
+    scalaOperator = { link = "GruvboxFg1" },
+    scalaTypeDeclaration = { link = "GruvboxYellow" },
+    scalaTypeTypePostDeclaration = { link = "GruvboxYellow" },
+    scalaInstanceDeclaration = { link = "GruvboxFg1" },
+    scalaInterpolation = { link = "GruvboxAqua" },
     -- markdown
     markdownItalic = { fg = colors.fg3, bold = config.italic },
     markdownBold = { fg = colors.fg3, bold = config.bold },
     markdownBoldItalic = { fg = colors.fg3, bold = config.bold, italic = config.italic },
     markdownH1 = { link = "GruvboxGreenBold" },
-    markdownH2 = { link = "markdownH1" },
+    markdownH2 = { link = "GruvboxGreenBold" },
     markdownH3 = { link = "GruvboxYellowBold" },
-    markdownH4 = { link = "markdownH3" },
+    markdownH4 = { link = "GruvboxYellowBold" },
     markdownH5 = { link = "GruvboxYellow" },
-    markdownH6 = { link = "markdownH5" },
+    markdownH6 = { link = "GruvboxYellow" },
     markdownCode = { link = "GruvboxAqua" },
     markdownCodeBlock = { link = "GruvboxAqua" },
     markdownCodeDelimiter = { link = "GruvboxAqua" },
@@ -356,244 +640,12 @@ groups.setup = function()
     haskellTypeRoles = { link = "GruvboxRedBold" },
     haskellTypeForall = { link = "GruvboxRed" },
     haskellPatternKeyword = { link = "GruvboxBlue" },
-    -- html
-    htmlTag = { link = "GruvboxAquaBold" },
-    htmlEndTag = { link = "GruvboxAquaBold" },
-    htmlTagName = { link = "GruvboxBlue" },
-    htmlArg = { link = "GruvboxOrange" },
-    htmlTagN = { link = "GruvboxFg1" },
-    htmlSpecialTagName = { link = "GruvboxBlue" },
-    htmlLink = { fg = colors.fg4, underline = config.underline },
-    htmlSpecialChar = { link = "GruvboxRed" },
-    htmlBold = { fg = colors.fg0, bg = colors.bg0, bold = config.bold },
-    htmlBoldUnderline = { fg = colors.fg0, bg = colors.bg0, bold = config.bold, underline = config.underline },
-    htmlBoldItalic = { fg = colors.fg0, bg = colors.bg0, bold = config.bold, italic = config.italic },
-    htmlBoldUnderlineItalic = {
-      fg = colors.fg0,
-      bg = colors.bg0,
-      bold = config.bold,
-      italic = config.italic,
-      underline = config.underline,
-    },
-    htmlUnderline = { fg = colors.fg0, bg = colors.bg0, underline = config.underline },
-    htmlUnderlineItalic = {
-      fg = colors.fg0,
-      bg = colors.bg0,
-      italic = config.italic,
-      underline = config.underline,
-    },
-    htmlItalic = { fg = colors.fg0, bg = colors.bg0, bold = config.italic },
-    -- netrw
-    netrwDir = { link = "GruvboxAqua" },
-    netrwClassify = { link = "GruvboxAqua" },
-    netrwLink = { link = "GruvboxGray" },
-    netrwSymLink = { link = "GruvboxFg1" },
-    netrwExe = { link = "GruvboxYellow" },
-    netrwComment = { link = "GruvboxGray" },
-    netrwList = { link = "GruvboxBlue" },
-    netrwHelpCmd = { link = "GruvboxAqua" },
-    netrwCmdSep = { link = "GruvboxFg3" },
-    netrwVersion = { link = "GruvboxGreen" },
-    -- nvim-treesitter
-    TSStrong = { bold = config.bold },
-    TSStrike = { strikethrough = config.strikethrough },
-    TSEmphasis = { italic = config.italic },
-    TSUnderline = { underline = config.underline },
-    -- telescope.nvim
-    TelescopeSelection = { link = "GruvboxOrangeBold" },
-    TelescopeSlectionCaret = { link = "GruvboxRed" },
-    TelescopeMultiSelection = { link = "GruvboxGray" },
-    TelescopeNormal = { link = "GruvboxFg1" },
-    TelescopeBorder = { link = "TelescopeNormal" },
-    TelescopePromptBorder = { link = "TelescopeNormal" },
-    TelescopeResultsBorder = { link = "TelescopeNormal" },
-    TelescopePreviewBorder = { link = "TelescopeNormal" },
-    TelescopeMatching = { link = "GruvboxBlue" },
-    TelescopePromptPrefix = { link = "GruvboxRed" },
-    TelescopePrompt = { link = "TelescopeNormal" },
-    -- lspsaga.nvim
-    LspSagaDiagnosticBorder = { link = "NormalNC" },
-    LspSagaDiagnosticHeader = { link = "GruvboxRed" },
-    LspSagaDiagnosticTruncateLine = { link = "NormalNC" },
-    LspFloatWinBorder = { link = "NormalNC" },
-    LspSagaBorderTitle = { link = "Title" },
-    TargetWord = { link = "Error" },
-    ReferencesCount = { link = "Title" },
-    ReferencesIcon = { link = "Special" },
-    DefinitionCount = { link = "Title" },
-    TargetFileName = { link = "Comment" },
-    DefinitionIcon = { link = "Special" },
-    ProviderTruncateLine = { link = "NormalNC" },
-    SagaShadow = { link = "GruvboxBg0" },
-    LspSagaFinderSelection = { link = "Search" },
-    DiagnosticTruncateLine = { link = "NormalNC" },
-    DiagnosticWarning = { link = "DiagnosticWarn" },
-    DiagnosticInformation = { link = "DiagnosticInfo" },
-    DefinitionPreviewTitle = { link = "Title" },
-    LspSagaShTruncateLine = { link = "NormalNC" },
-    LspSagaDocTruncateLine = { link = "NormalNC" },
-    LineDiagTuncateLine = { link = "NormalNC" },
-    LspSagaCodeActionTitle = { link = "Title" },
-    LspSagaCodeActionTruncateLine = { link = "NormalNC" },
-    LspSagaCodeActionContent = { link = "Normal" },
-    LspSagaRenamePromptPrefix = { link = "GruvboxFg2" },
-    LspSagaRenameBorder = { bold = config.bold },
-    LspSagaHoverBorder = { bold = config.bold },
-    LspSagaSignatureHelpBorder = { bold = config.bold },
-    LspSagaCodeActionBorder = { bold = config.bold },
-    LspSagaAutoPreview = {},
-    LspSagaDefPreviewBorder = { bold = config.bold },
-    LspLinesDiagBorder = { bold = config.bold },
-    -- vim-startify
-    StartifyBracket = { link = "GruvboxFg3" },
-    StartifyFile = { link = "GruvboxFg1" },
-    StartifyNumber = { link = "GruvboxBlue" },
-    StartifyPath = { link = "GruvboxGray" },
-    StartifySlash = { link = "GruvboxGray" },
-    StartifySection = { link = "GruvboxYellow" },
-    StartifySpecial = { link = "GruvboxBg2" },
-    StartifyHeader = { link = "GruvboxOrange" },
-    StartifyFooter = { link = "GruvboxBg2" },
-    StartifyVar = { link = "StartifyPath" },
-    StartifySelect = { link = "Title" },
-    -- vim-signify
-    SignifySignAdd = { link = "GruvboxGreenSign" },
-    SignifySignChange = { link = "GruvboxAquaSign" },
-    SignifySignDelete = { link = "GruvboxRedSign" },
-    -- syntastic
-    SyntasticError = { link = "GruvboxRedUnderline" },
-    SyntasticWarning = { link = "GruvboxYellowUnderline" },
-    SyntasticErrorSign = { link = "GruvboxRedSign" },
-    SyntasticWarningSign = { link = "GruvboxYellowSign" },
-    -- termdebug
-    debugPC = { bg = colors.faded_blue },
-    debugBreakpoint = { link = "GruvboxRedSign" },
-    -- vim-dirvish
-    DirvishPathTail = { link = "GruvboxAqua" },
-    DirvishArg = { link = "GruvboxYellow" },
-    -- nerdtree
-    NERDTreeDir = { link = "GruvboxAqua" },
-    NERDTreeDirSlash = { link = "GruvboxAqua" },
-    NERDTreeOpenable = { link = "GruvboxOrange" },
-    NERDTreeClosable = { link = "GruvboxOrange" },
-    NERDTreeFile = { link = "GruvboxFg1" },
-    NERDTreeExecFile = { link = "GruvboxYellow" },
-    NERDTreeUp = { link = "GruvboxGray" },
-    NERDTreeCWD = { link = "GruvboxGreen" },
-    NERDTreeHelp = { link = "GruvboxFg1" },
-    NERDTreeToggleOn = { link = "GruvboxGreen" },
-    NERDTreeToggleOff = { link = "GruvboxRed" },
-    -- coc.nvim
-    CocErrorSign = { link = "GruvboxRedSign" },
-    CocWarningSign = { link = "GruvboxOrangeSign" },
-    CocInfoSign = { link = "GruvboxBlueSign" },
-    CocHintSign = { link = "GruvboxAquaSign" },
-    CocErrorFloat = { link = "GruvboxRed" },
-    CocWarningFloat = { link = "GruvboxOrange" },
-    CocInfoFloat = { link = "GruvboxBlue" },
-    CocHintFloat = { link = "GruvboxAqua" },
-    CocDiagnosticsError = { link = "GruvboxRed" },
-    CocDiagnosticsWarning = { link = "GruvboxOrange" },
-    CocDiagnosticsInfo = { link = "GruvboxBlue" },
-    CocDiagnosticsHint = { link = "GruvboxAqua" },
-    CocSelectedText = { link = "GruvboxRed" },
-    CocCodeLens = { link = "GruvboxGray" },
-    CocErrorHighlight = { link = "GruvboxRedUnderline" },
-    CocWarningHighlight = { link = "GruvboxOrangeUnderline" },
-    CocInfoHighlight = { link = "GruvboxBlueUnderline" },
-    CocHintHighlight = { link = "GruvboxAquaUnderline" },
-    -- ale.vim
-    ALEError = { link = "GruvboxRedUnderline" },
-    ALEWarning = { link = "GruvboxYellowUnderline" },
-    ALEInfo = { link = "GruvboxBlueUnderline" },
-    ALEErrorSign = { link = "GruvboxRedSign" },
-    ALEWarningSign = { link = "GruvboxYellowSign" },
-    ALEInfoSign = { link = "GruvboxBlueSign" },
-    ALEVirtualTextError = { link = "GruvboxRed" },
-    ALEVirtualTextWarning = { link = "GruvboxYellow" },
-    ALEVirtualTextInfo = { link = "GruvboxBlue" },
-    -- vim-buftabline
-    BufTabLineCurrent = { link = "TabLineSel" },
-    BufTabLineActive = { link = "PmenuSel" },
-    BufTabLineHidden = { link = "TabLine" },
-    BufTabLineFill = { link = "TabLineFill" },
-    BufTabLineModifiedCurrent = { link = "BufTabLineCurrent" },
-    BufTabLineModifiedActive = { link = "BufTabLineActive" },
-    BufTabLineModifiedHidden = { link = "BufTabLineHidden" },
-    -- ctrlP
-    CtrlPMatch = { link = "Identifier" },
-    CtrlPNoEntries = { link = "Error" },
-    CtrlPPrtBase = { link = "Comment" },
-    CtrlPPrtCursor = { link = "Constant" },
-    CtrlPLinePre = { fg = colors.bg2 },
-    CtrlPMode1 = { link = "Character" },
-    CtrlPMode2 = { link = "LineNr" },
-    CtrlPStats = { link = "Function" },
-    -- fzf.vim
-    Fzf1 = { fg = colors.blue, bg = colors.bg1 },
-    Fzf2 = { fg = colors.orange, bg = colors.bg1 },
-    Fzf3 = { fg = colors.fg4, bg = colors.bg1 },
-    ShowMarksHLl = { link = "GruvboxBlueSign" },
-    ShowMarksHLu = { link = "GruvboxBlueSign" },
-    ShowMarksHLo = { link = "GruvboxBlueSign" },
-    ShowMarksHLm = { link = "GruvboxBlueSign" },
-    -- git-gutter
-    GitGutterAdd = { link = "GruvboxGreenSign" },
-    GitGutterChange = { link = "GruvboxAquaSign" },
-    GitGutterDelete = { link = "GruvboxRedSign" },
-    GitGutterChangeDelete = { link = "GruvboxAquaSign" },
-    -- gitsigns.nvim
-    GitSignsAdd = { link = "GruvboxGreenSign" },
-    GitSignsChange = { link = "GruvboxOrangeSign" },
-    GitSignsDelete = { link = "GruvboxRedSign" },
-    GitSignsCurrentLineBlame = { link = "NonText" },
-    -- nvim-cmp
-    CmpItemAbbr = { link = "GruvboxFg0" },
-    CmpItemAbbrDeprecated = { link = "GruvboxFg0" },
-    CmpItemAbbrMatch = { link = "GruvboxBlue" },
-    CmpItemAbbrMatchFuzzy = { underline = config.underline, fg = colors.aqua },
-    CmpItemKind = { link = "GruvboxOrange" },
-    CmpItemKindClass = { link = "GruvboxGreen" },
-    CmpItemKindConstructor = { link = "GruvboxGreen" },
-    CmpItemKindField = { link = "GruvboxAqua" },
-    CmpItemKindFile = { link = "GruvboxOrange" },
-    CmpItemKindFolder = { link = "GruvboxOrange" },
-    CmpItemKindFunction = { link = "GruvboxPurple" },
-    CmpItemKindInterface = { link = "GruvboxGreen" },
-    CmpItemKindKeyword = { link = "Keyword" },
-    CmpItemKindMethod = { link = "GruvboxPurple" },
-    CmpItemKindSnippet = { link = "GruvboxYellow" },
-    CmpItemKindText = { link = "GruvboxFg0" },
-    CmpItemKindValue = { link = "GruvboxOrange" },
-    CmpItemKindVariable = { link = "GruvboxBlue" },
-    CmpItemMenu = { link = "GruvboxGray" },
-    -- LSP
-    LspCodeLens = { link = "GruvboxGray" },
-    LspReferenceRead = { bg = colors.bg2, underline = config.underline },
-    LspReferenceText = { bg = colors.bg2, underline = config.underline },
-    LspReferenceWrite = { bg = colors.bg2, underline = config.underline },
-    -- Diagnostic
-    DiagnosticError = { link = "GruvboxRed" },
-    DiagnosticSignError = { link = "GruvboxRedSign" },
-    DiagnosticUnderlineError = { link = "GruvboxRedUnderline" },
-    DiagnosticWarn = { link = "GruvboxYellow" },
-    DiagnosticSignWarn = { link = "GruvboxYellowSign" },
-    DiagnosticUnderlineWarn = { link = "GruvboxYellowUnderline" },
-    DiagnosticInfo = { link = "GruvboxBlue" },
-    DiagnosticSignInfo = { link = "GruvboxBlueSign" },
-    DiagnosticUnderlineInfo = { link = "GruvboxBlueUnderline" },
-    DiagnosticHint = { link = "GruvboxAqua" },
-    DiagnosticSignHint = { link = "GruvboxAquaSign" },
-    DiagnosticUnderlineHint = { link = "GruvboxAquaUnderline" },
-    DiagnosticFloatingError = { link = "GruvboxRed" },
-    DiagnosticFloatingWarn = { link = "GruvboxOrange" },
-    DiagnosticFloatingInfo = { link = "GruvboxBlue" },
-    DiagnosticFloatingHint = { link = "GruvboxAqua" },
-    DiagnosticVirtualTextError = { link = "GruvboxRed" },
-    DiagnosticVirtualTextWarn = { link = "GruvboxYellow" },
-    DiagnosticVirtualTextInfo = { link = "GruvboxBlue" },
-    DiagnosticVirtualTextHint = { link = "GruvboxAqua" },
-    -- mail.vim
+    -- json
+    jsonKeyword = { link = "GruvboxGreen" },
+    jsonQuote = { link = "GruvboxGreen" },
+    jsonBraces = { link = "GruvboxFg1" },
+    jsonString = { link = "GruvboxFg1" },
+    -- mail
     mailQuoted1 = { link = "GruvboxAqua" },
     mailQuoted2 = { link = "GruvboxPurple" },
     mailQuoted3 = { link = "GruvboxYellow" },
@@ -601,6 +653,47 @@ groups.setup = function()
     mailQuoted5 = { link = "GruvboxRed" },
     mailQuoted6 = { link = "GruvboxOrange" },
     mailSignature = { link = "Comment" },
+    -- c#
+    csBraces = { link = "GruvboxFg1" },
+    csEndColon = { link = "GruvboxFg1" },
+    csLogicSymbols = { link = "GruvboxFg1" },
+    csParens = { link = "GruvboxFg3" },
+    csOpSymbols = { link = "GruvboxFg3" },
+    csInterpolationDelimiter = { link = "GruvboxFg3" },
+    csInterpolationAlignDel = { link = "GruvboxAquaBold" },
+    csInterpolationFormat = { link = "GruvboxAqua" },
+    csInterpolationFormatDel = { link = "GruvboxAquaBold" },
+    -- rust btw
+    rustSigil = { link = "GruvboxOrange" },
+    rustEscape = { link = "GruvboxAqua" },
+    rustStringContinuation = { link = "GruvboxAqua" },
+    rustEnum = { link = "GruvboxAqua" },
+    rustStructure = { link = "GruvboxAqua" },
+    rustModPathSep = { link = "GruvboxFg2" },
+    rustCommentLineDoc = { link = "Comment" },
+    rustDefault = { link = "GruvboxAqua" },
+    -- ocaml
+    ocamlOperator = { link = "GruvboxFg1" },
+    ocamlKeyChar = { link = "GruvboxOrange" },
+    ocamlArrow = { link = "GruvboxOrange" },
+    ocamlInfixOpKeyword = { link = "GruvboxRed" },
+    ocamlConstructor = { link = "GruvboxOrange" },
+    -- lspsaga.nvim
+    LspSagaCodeActionTitle = { link = "Title" },
+    LspSagaCodeActionBorder = { link = "GruvboxFg1" },
+    LspSagaCodeActionContent = { fg = colors.green, bold = config.bold },
+    LspSagaLspFinderBorder = { link = "GruvboxFg1" },
+    LspSagaAutoPreview = { link = "GruvboxOrange" },
+    TargetWord = { fg = colors.blue, bold = config.bold },
+    FinderSeparator = { link = "GruvboxAqua" },
+    LspSagaDefPreviewBorder = { link = "GruvboxBlue" },
+    LspSagaHoverBorder = { link = "GruvboxOrange" },
+    LspSagaRenameBorder = { link = "GruvboxBlue" },
+    LspSagaDiagnosticSource = { link = "GruvboxOrange" },
+    LspSagaDiagnosticBorder = { link = "GruvboxPurple" },
+    LspSagaDiagnosticHeader = { link = "GruvboxGreen" },
+    LspSagaSignatureHelpBorder = { link = "GruvboxGreen" },
+    SagaShadow = { link = "GruvboxBg0" },
   }
 
   for group, hl in pairs(config.overrides) do