README.md

@@ -32,7 +32,7 @@ Add the following line into the function `return require("lazy").setup({})` to l
   'tiyn/tccs.nvim',
   config = function()
     require('tccs').setup()
-    vim.cmd('colorscheme tccs')
+    require('tccs').load()
   end
 },
 ```

lua/lualine/themes/tccs.lua

@@ -3,32 +3,44 @@
 local config = require('tccs.config')
 local c = require('tccs.colors').get_colors()
 
+local line_c = {
+  fg_prim  = c.fg,
+  bg_prim  = c.bg_alt,
+  fg_sec   = c.fg,
+  bg_sec   = c.panel_shadow,
+  visual   = c.operator,
+  insert   = c.comment,
+  normal   = c.entity,
+  replace  = c.vcs_removed,
+  contrast = c.string,
+}
+
 return {
   normal = {
-    a = { fg = c.line_bg, bg = c.line_normal, gui = 'bold' },
+    a = { fg = line_c.bg_prim, bg = line_c.insert, gui = 'bold' },
-    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
-    c = { fg = c.line_fg, bg = c.line_bg },
+    c = { fg = line_c.fg_sec, bg = config.opts.transparent and 'NONE' or line_c.bg_prim },
   },
   insert = {
-    a = { fg = c.line_bg, bg = c.line_insert, gui = 'bold' },
+    a = { fg = line_c.bg_prim, bg = line_c.normal, gui = 'bold' },
-    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
   },
   visual = {
-    a = { fg = c.line_bg, bg = c.line_visual, gui = 'bold' },
+    a = { fg = line_c.bg_prim, bg = line_c.visual, gui = 'bold' },
-    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
   },
   replace = {
-    a = { fg = c.line_bg, bg = c.line_replace, gui = 'bold' },
+    a = { fg = line_c.bg_prim, bg = line_c.replace, gui = 'bold' },
-    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
   },
   command = {
-    a = { fg = c.line_bg, bg = c.line_contrast, gui = 'bold' },
+    a = { fg = line_c.bg_prim, bg = line_c.contrast, gui = 'bold' },
-    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
-    c = { fg = c.line_fg, bg = c.line_bg },
+    c = { fg = line_c.fg_sec, bg = config.opts.transparent and 'NONE' or line_c.bg_prim },
   },
   inactive = {
-    a = { fg = c.line_fg, bg = c.line_bg_alt, gui = 'bold' },
+    a = { fg = line_c.fg_prim, bg = line_c.bg_sec, gui = 'bold' },
-    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
-    c = { fg = c.line_fg, bg = c.line_bg },
+    c = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_prim },
   },
 }

lua/tccs/colors.lua

@@ -3,51 +3,45 @@ colors.get_colors = function()
   local mycolors = {} ---@type table<string,string>
 
   mycolors = {
-    -- ui
+    -- common
-    bg            = "#191919",
+    accent             = "#C586C0",
-    bg_alt        = "#0D1016",
+    bg                 = "#191919",
-    fg            = "#D4D4D4",
+    bg_alt             = "#121212",
-    fg_alt        = "#CE9178",
+    fg                 = "#D4D4D4",
-    accent        = "#C586C0",
+    ui                 = "#4D5566",
-    accent_alt    = "#608B4E",
-    ui            = "#4D5566",
-    color_column  = "#772222",
-    popup         = "#272727",
-    border        = "#242A35",
-    border_alt    = "#393F4D",
     -- syntax
-    tag           = "#9CDCFE",
+    tag                = "#9CDCFE",
-    func          = "#DCDCAA",
+    func               = "#DCDCAA",
-    entity        = "#9CDCFE",
+    entity             = "#9CDCFE",
-    string        = "#CE9178",
+    string             = "#CE9178",
-    regexp        = "#D16969",
+    regexp             = "#D16969",
-    markup        = "#C586C0",
+    markup             = "#C586C0",
-    keyword       = "#C586C0",
+    keyword            = "#C586C0",
-    special       = "#D7BA7D",
+    special            = "#D7BA7D",
-    comment       = "#608B4E",
+    comment            = "#608B4E",
-    constant      = "#4FC1FE",
+    constant           = "#D4D4D4",
-    bold          = "#569CD6",
+    operator           = "#C586C0",
-    operator      = "#C586C0",
+    error              = "#FF0000",
-    number        = "#B5CEA8",
     -- extended color palette
-    fg_idle       = "#FFD602",
+    fg_idle            = "#FFFF00",
-    -- git
+    warning            = "#FFFF00",
-    added         = "#6A9955",
+    -- ui
-    modified      = "#4FC1FE",
+    line               = "#00010A",
-    removed       = "#D16969",
+    line_alt           = "#772222",
-    -- lsp
+    panel_bg           = "#0D1016",
-    error         = "#FB0101",
+    panel_shadow       = "#00010A",
-    warning       = "#FFD602",
+    panel_border       = "#000000",
-    hint          = "#608B4E",
+    gutter_normal      = "#323945",
-    -- line
+    gutter_active      = "#464D5E",
-    line_fg       = "#D4D4D4",
+    selection_bg       = "#273747",
-    line_bg       = "#272727",
+    selection_inactive = "#1B2733",
-    line_bg_alt   = "#0D1016",
+    selection_border   = "#304357",
-    line_visual   = "#C586C0",
+    guide_active       = "#393F4D",
-    line_normal   = "#6A9955",
+    guide_normal       = "#242A35",
-    line_insert   = "#4FC1Fe",
+    -- vcs
-    line_replace  = "#D16969",
+    vcs_added          = "#608B4E",
-    line_contrast = "#CE9178",
+    vcs_modified       = "#9CDCFE",
+    vcs_removed        = "#D16969",
   }
 
   -- Extend the colors with overrides passed by `color_overrides`

lua/tccs/theme.lua

@@ -5,55 +5,59 @@ theme.set_highlights = function(opts)
   local c = require('tccs.colors').get_colors()
 
   hl(0, 'Normal', { fg = c.fg, bg = c.bg })
-  hl(0, 'ColorColumn', { bg = c.color_column })
+  hl(0, 'ColorColumn', { bg = c.line_alt })
   hl(0, 'Cursor', { fg = c.tag })
-  hl(0, 'CursorLine', { bg = c.bg_alt })
+  hl(0, 'CursorLine', { bg = c.line })
-  hl(0, 'CursorColumn', { bg = c.bg_alt })
+  hl(0, 'CursorColumn', { bg = c.line })
 
-  hl(0, 'CursorLineNr', { fg = c.accent, bg = c.bg_alt })
+  hl(0, 'CursorLineNr', { fg = c.accent, bg = c.line })
-  hl(0, 'LineNr', { fg = c.border })
+  hl(0, 'LineNr', { fg = c.guide_normal })
 
   hl(0, 'Directory', { fg = c.func })
 
   hl(0, 'ErrorMsg', { fg = c.fg, bg = c.error, standout = true })
 
-  hl(0, 'VertSplit', { fg = c.bg_alt, bg = c.bg_alt })
+  hl(0, 'VertSplit', { fg = c.panel_bg, bg = c.panel_bg })
 
-  hl(0, 'Folded', { fg = c.fg_idle, bg = c.bg })
+  hl(0, 'Folded', { fg = c.fg_idle, bg = c.panel_bg })
-  hl(0, 'FoldColumn', { bg = c.bg })
+  hl(0, 'FoldColumn', { bg = c.panel_bg })
-  hl(0, 'SignColumn', { bg = c.bg })
+  hl(0, 'SignColumn', { bg = c.panel_bg })
 
   hl(0, 'MatchParen', { fg = c.fg, bg = c.bg, underline = true })
-  hl(0, 'ModeMsg', { fg = c.fg_alt })
+  hl(0, 'ModeMsg', { fg = c.string })
-  hl(0, 'MoreMsg', { fg = c.fg_alt })
+  hl(0, 'MoreMsg', { fg = c.string })
-  hl(0, 'NonText', { fg = c.border })
+  hl(0, 'NonText', { fg = c.guide_normal })
 
-  hl(0, 'Pmenu', { fg = c.fg, bg = c.popup, ctermfg = 188, ctermbg = 235 })
+  -- TODO: fix pmenu colors
-  hl(0, 'PmenuSel', { fg = c.popup, bg = c.fg, ctermfg = 235, ctermbg = 188 })
+  hl(0, 'Pmenu', { fg = c.fg, bg = c.selection_inactive })
+  hl(0, 'PmenuSel', { fg = c.fg, bg = c.selection_inactive, reverse = true })
 
-  hl(0, 'FloatBorder', { fg = c.fg, bg = c.popup })
+  hl(0, 'FloatBorder', { fg = c.fg, bg = c.selection_inactive })
-  hl(0, 'Question', { fg = c.fg_alt })
+  hl(0, 'Question', { fg = c.string })
-  hl(0, 'Search', { fg = c.bg, bg = c.fg })
+  hl(0, 'Search', { fg = c.bg, bg = c.constant })   -- TODO: fix color
-  hl(0, 'SpecialKey', { fg = c.popup })
+  hl(0, 'SpecialKey', { fg = c.selection_inactive })
 
-  hl(0, 'SpellCap', { fg = c.warning, undercurl = true, sp = c.error })
+  hl(0, 'SpellCap', { fg = c.tag, undercurl = true, sp = c.error })
-  hl(0, 'SpellLocal', { fg = c.warning, undercurl = true, sp = c.keyword })
+  hl(0, 'SpellLocal', { fg = c.keyword, undercurl = true, sp = c.keyword })
   hl(0, 'SpellBad', { fg = c.error, undercurl = true, sp = c.error })
-  hl(0, 'SpellRare', { fg = c.error, undercurl = true, sp = c.error })
+  hl(0, 'SpellRare', { fg = c.regexp, undercurl = true, sp = c.error })
 
-  hl(0, 'StatusLine', { fg = c.fg, bg = c.bg_alt })
+  hl(0, 'StatusLine', { fg = c.fg, bg = c.panel_bg })
-  hl(0, 'StatusLineNC', { fg = c.fg_idle, bg = c.bg_alt })
+  hl(0, 'StatusLineNC', { fg = c.fg_idle, bg = c.panel_bg })
 
-  hl(0, 'WildMenu', { fg = c.fg, bg = c.popup })
+  hl(0, 'WildMenu', { fg = c.fg, bg = c.markup })   -- TODO: fix color
 
-  hl(0, 'TabLine', { fg = c.accent_alt, bg = c.bg_alt })
+  hl(0, 'TabLine', { fg = c.comment, bg = c.panel_shadow })
-  hl(0, 'TabLineFill', { fg = c.fg, bg = c.popup })
+  hl(0, 'TabLineFill', { fg = c.fg, bg = c.panel_border })
   hl(0, 'TabLineSel', { fg = c.fg, bg = c.bg })
 
-  hl(0, 'Visual', { bg = c.popup })
+  hl(0, 'Title', { fg = c.keyword, bold = true })
+
+  hl(0, 'Visual', { bg = c.selection_inactive })
+
+  hl(0, 'WarningMsg', { fg = c.warning, bold = true })
 
   -- syntax
-  hl(0, 'Title', { fg = c.keyword, bold = true })
   hl(0, 'Comment', { fg = c.comment, italic = opts.italic_comments })
   hl(0, 'Constant', { fg = c.constant })
   hl(0, 'String', { fg = c.string })
@@ -62,83 +66,80 @@ theme.set_highlights = function(opts)
   hl(0, 'Statement', { fg = c.keyword })
   hl(0, 'Operator', { fg = c.operator })
   hl(0, 'Exception', { fg = c.markup })
-  hl(0, 'PreProc', { fg = c.keyword })
+  hl(0, 'PreProc', { fg = c.accent })
   hl(0, 'Type', { fg = c.entity })
   hl(0, 'Structure', { fg = c.special })
-  hl(0, 'Special', { fg = c.special })
+  --hl(0, 'Special', { fg = c.accent })
   hl(0, 'Delimiter', { fg = c.special })
   hl(0, 'Underlined', { fg = c.tag, underline = true })
   hl(0, 'Ignore', {})
   hl(0, 'Error', { fg = c.fg, bg = c.error, undercurl = true, sp = c.error })
   hl(0, 'Todo', { fg = c.markup })
-  hl(0, 'Number', { fg = c.number })
 
   -- quickfix window highlighting
-  hl(0, 'qfLineNr', { fg = c.accent })
+  hl(0, 'qfLineNr', { fg = c.keyword })
-  hl(0, 'Conceal', { fg = c.accent_alt })
+  hl(0, 'Conceal', { fg = c.comment })
-  hl(0, 'CursorLineConceal', { fg = c.border, bg = c.bg_alt })
+  hl(0, 'CursorLineConceal', { fg = c.guide_normal, bg = c.line })
 
   -- diff syntax highlighting
-  hl(0, 'DiffAdd', { fg = c.added, bg = c.border })
+  hl(0, 'DiffAdd', { fg = c.vcs_added, bg = c.guide_normal })
   hl(0, 'diffAdded', { link = 'DiffAdd' })
-  hl(0, 'DiffChange', { fg = c.modified, bg = c.border })
+  hl(0, 'DiffChange', { fg = c.vcs_modified, bg = c.guide_normal })
-  hl(0, 'DiffDelete', { fg = c.removed, bg = c.border })
+  hl(0, 'DiffDelete', { fg = c.vcs_removed, bg = c.guide_normal })
   hl(0, 'diffRemoved', { link = 'DiffDelete' })
-  hl(0, 'DiffText', { fg = c.modified, bg = c.border_alt })
+  hl(0, 'DiffText', { fg = c.vcs_modified, bg = c.guide_active })
 
   -- netrw
-  hl(0, 'netrwClassify', { fg = c.fg_alt })
+  hl(0, 'netrwClassify', { fg = c.special })
 
   -- gitgutter
-  hl(0, 'GitGutterAdd', { fg = c.added, bg = c.bg })
+  hl(0, 'GitGutterAdd', { fg = c.vcs_added, bg = c.panel_bg })
-  hl(0, 'GitGutterChange', { fg = c.modified, bg = c.bg })
+  hl(0, 'GitGutterChange', { fg = c.vcs_modified, bg = c.panel_bg })
-  hl(0, 'GitGutterDelete', { fg = c.removed, bg = c.bg })
+  hl(0, 'GitGutterDelete', { fg = c.vcs_removed, bg = c.panel_bg })
-  hl(0, 'GitGutterChangeDelete', { fg = c.modified, bg = c.bg, underline = true })
+  hl(0, 'GitGutterChangeDelete', { fg = c.vcs_modified, bg = c.panel_bg, underline = true })
 
   -- signify
-  hl(0, 'SignifySignAdd', { fg = c.added, bg = c.bg })
+  hl(0, 'SignifySignAdd', { fg = c.vcs_added, bg = c.panel_bg })
-  hl(0, 'SignifySignChange', { fg = c.modified, bg = c.bg })
+  hl(0, 'SignifySignChange', { fg = c.vcs_modified, bg = c.panel_bg })
-  hl(0, 'SignifySignDelete', { fg = c.removed, bg = c.bg })
+  hl(0, 'SignifySignDelete', { fg = c.vcs_removed, bg = c.panel_bg })
-  hl(0, 'SignifySignChangeDelete', { fg = c.modified, bg = c.bg, underline = true })
+  hl(0, 'SignifySignChangeDelete', { fg = c.vcs_modified, bg = c.panel_bg, underline = true })
 
   -- nerdtree
   hl(0, 'NERDTreeOpenable', { fg = c.fg_idle })
   hl(0, 'NERDTreeCloseable', { fg = c.accent })
   hl(0, 'NERDTreeUp', { fg = c.fg_idle })
-  hl(0, 'NERDTreeDir', { fg = c.fg_alt })
+  hl(0, 'NERDTreeDir', { fg = c.func })
   hl(0, 'NERDTreeFile', {})
-  hl(0, 'NERDTreeDirSlash', { fg = c.fg_alt })
+  hl(0, 'NERDTreeDirSlash', { fg = c.special })
 
   -- telescope
   hl(0, 'TelescopeMatching', { fg = c.accent, bold = true })
-  hl(0, 'TelescopePromptBorder', { fg = c.border })
+  hl(0, 'TelescopePromptBorder', { fg = c.guide_normal })
-  hl(0, 'TelescopeResultsBorder', { fg = c.border })
+  hl(0, 'TelescopeResultsBorder', { fg = c.guide_normal })
-  hl(0, 'TelescopePreviewBorder', { fg = c.border })
+  hl(0, 'TelescopePreviewBorder', { fg = c.guide_normal })
   hl(0, 'TelescopeNormal', { fg = c.fg })
-  hl(0, 'TelescopeSelection', { fg = c.bg, bg = c.fg })
+  hl(0, 'TelescopeSelection', { fg = c.fg, bg = c.vscPopupHighlightBlue })
-  hl(0, 'TelescopeMultiSelection', { fg = c.bg, bg = c.fg })
+  hl(0, 'TelescopeMultiSelection', { fg = c.fg, bg = c.vscPopupHighlightBlue })
   hl(0, 'TelescopePromptPrefix', { fg = c.fg, bg = 'NONE' })
 
-  -- diagnostics
+  -- lsp
   hl(0, 'DiagnosticDefaultError', { fg = c.error })
   hl(0, 'DiagnosticUnderlineError', { fg = c.error, undercurl = true, sp = c.error })
-  hl(0, 'DiagnosticSignError', { fg = c.error, bg = c.bg_alt })
+  hl(0, 'DiagnosticSignError', { fg = c.error, bg = c.panel_bg })
   hl(0, 'DiagnosticWarn', { fg = c.warning })
   hl(0, 'DiagnosticUnderlineWarn', { fg = c.warning, undercurl = true, sp = c.warning })
-  hl(0, 'DiagnosticSignWarning', { fg = c.warning, bg = c.bg_alt })
+  hl(0, 'DiagnosticSignWarning', { fg = c.warning, bg = c.panel_bg })
-  hl(0, 'DiagnosticVirtualTextHint', { fg = c.hint })
+  hl(0, 'DiagnosticVirtualTextHint', { fg = c.comment })
-  hl(0, 'DiagnosticSignHint', { fg = c.hint })
+  hl(0, 'DiagnosticSignHint', { fg = c.comment })
-  hl(0, 'DiagnosticHint', { fg = c.hint })
+  hl(0, 'DiagnosticHint', { fg = c.comment })
   hl(0, 'DiagnosticVirtualTextInfo', { fg = c.fg })
   hl(0, 'DiagnosticSignInfo', { fg = c.fg })
   hl(0, 'DiagnosticInfo', { fg = c.fg })
 
-  hl(0, 'WarningMsg', { fg = c.warning, bold = true })
+  -- yats
-
-  -- typescript
   hl(0, 'typescriptDecorator', { fg = c.markup })
-  hl(0, 'typescriptImport', { fg = c.keyword })
+  hl(0, 'typescriptImport', { fg = c.accent })
-  hl(0, 'typescriptExport', { fg = c.keyword })
+  hl(0, 'typescriptExport', { fg = c.accent })
   hl(0, 'typescriptIdentifier', { fg = c.tag, italic = opts.italic_comments })
   hl(0, 'typescriptAssign', { fg = c.operator })
   hl(0, 'typescriptBinaryOp', { fg = c.operator })
@@ -157,10 +158,10 @@ theme.set_highlights = function(opts)
   hl(0, 'typescriptOperator', { fg = c.keyword })
   hl(0, 'typescriptArrowFunc', { fg = c.operator })
   hl(0, 'typescriptBraces', { fg = c.special })
-  hl(0, 'typescriptGlobal', { fg = c.keyword })
+  hl(0, 'typescriptGlobal', { fg = c.accent })
   hl(0, 'typescriptDOMFormProp', { fg = c.entity })
   hl(0, 'typescriptDOMEventProp', { fg = c.entity })
-  hl(0, 'typescriptBOMWindowProp', { fg = c.keyword })
+  hl(0, 'typescriptBOMWindowProp', { fg = c.accent })
   hl(0, 'typescriptDateMethod', { fg = c.func })
   hl(0, 'typescriptBlobMethod', { fg = c.func })
   hl(0, 'typescriptArrayMethod', { fg = c.func })
@@ -194,7 +195,7 @@ theme.set_highlights = function(opts)
   hl(0, 'jsArrowFunction', { fg = c.operator })
 
   -- treesitter
-  hl(0, '@include', { fg = c.keyword })
+  hl(0, '@include', { fg = c.accent })
   hl(0, '@parameter', { fg = c.special })
   hl(0, '@field', { fg = c.tag })
   hl(0, '@property', { fg = c.tag })
@@ -203,8 +204,7 @@ theme.set_highlights = function(opts)
   hl(0, '@constant.builtin', { fg = c.constant })
   hl(0, '@string.regex', { fg = c.regexp })
   hl(0, '@function.macro', { fg = c.func })
-  hl(0, '@text.title', { fg = c.bold, bold = true })
+
-  hl(0, '@text.strong', { fg = c.bold, bold = true })
 
   -- fugitive
   hl(0, 'fugitiveUntrackedHeading', { fg = c.accent })
@@ -213,10 +213,10 @@ theme.set_highlights = function(opts)
   hl(0, 'fugitiveHeading', { fg = c.accent })
 
   -- git commit
-  hl(0, 'gitcommitBranch', { fg = c.ui })
+  hl(0, 'gitcommitBranch', { fg = c.func })
   hl(0, 'gitcommitHeader', { fg = c.accent })
   hl(0, 'gitcommitSummary', { fg = c.fg })
-  hl(0, 'gitcommitOverflow', { fg = c.accent })
+  hl(0, 'gitcommitOverflow', { fg = c.markup })
 
   -- startify
   hl(0, 'StartifyFile', { fg = c.fg })
@@ -239,14 +239,14 @@ theme.set_highlights = function(opts)
   -- pandoc
   hl(0, 'pandocPipeTableHeader', { fg = c.keyword })
   hl(0, 'pandocPipeTableDelims', { fg = c.keyword })
-  hl(0, 'pandocDelimitedCodeBlock', { fg = c.keyword })
+  hl(0, 'pandocDelimitedCodeBlock', { fg = c.accent })
 
   -- shell
   hl(0, 'shTestOpr', { fg = c.operator })
   hl(0, 'shOption', { fg = c.special })
   hl(0, 'shQuote', { fg = c.string })
 
-  -- haskell
+  -- shell
   hl(0, 'haskellDeclKeyword', { fg = c.keyword })
   hl(0, 'haskellLet', { fg = c.keyword })
   hl(0, 'haskellWhere', { fg = c.keyword })
@@ -264,24 +264,24 @@ theme.set_highlights = function(opts)
 
   -- nvimtree
   hl(0, 'NvimTreeRootFolder', { fg = c.fg, bold = true })
-  hl(0, 'NvimTreeGitDirty', { fg = c.modified })
+  hl(0, 'NvimTreeGitDirty', { fg = c.vcs_modified })
-  hl(0, 'NvimTreeGitNew', { fg = c.added })
+  hl(0, 'NvimTreeGitNew', { fg = c.vcs_added })
-  hl(0, 'NvimTreeImageFile', { fg = c.accent })
+  hl(0, 'NvimTreeImageFile', { fg = c.keyword })
   hl(0, 'NvimTreeEmptyFolderName', { fg = c.ui })
   hl(0, 'NvimTreeFolderName', { fg = c.fg })
-  hl(0, 'NvimTreeSpecialFile', { fg = c.accent, underline = true })
+  hl(0, 'NvimTreeSpecialFile', { fg = c.keyword, underline = true })
   hl(0, 'NvimTreeNormal', { fg = c.fg })
   hl(0, 'NvimTreeCursorLine', {})
-  hl(0, 'NvimTreeVertSplit', { bg = c.bg_alt })
+  hl(0, 'NvimTreeVertSplit', { bg = c.bg })
   hl(0, 'NvimTreeEndOfBuffer', {})
   hl(0, 'NvimTreeOpenedFolderName', {})
-  hl(0, 'NvimTreeGitRenamed', { fg = c.modified })
+  hl(0, 'NvimTreeGitRenamed', { fg = c.vcs_modified })
   hl(0, 'NvimTreeGitIgnored', { fg = c.ui })
-  hl(0, 'NvimTreeGitDeleted', { fg = c.removed })
+  hl(0, 'NvimTreeGitDeleted', { fg = c.vcs_removed })
-  hl(0, 'NvimTreeGitStaged', { fg = c.added })
+  hl(0, 'NvimTreeGitStaged', { fg = c.vcs_added })
-  hl(0, 'NvimTreeGitMerge', { fg = c.modified })
+  hl(0, 'NvimTreeGitMerge', { fg = c.error })
-  hl(0, 'NvimTreeGitDirty', { fg = c.modified })
+  hl(0, 'NvimTreeGitDirty', { fg = c.vcs_modified })
-  hl(0, 'NvimTreeGitNew', { fg = c.added })
+  hl(0, 'NvimTreeGitNew', { fg = c.vcs_added })
 end
 
 return theme
@@ -293,6 +293,7 @@ return theme
 --hl(0, 'PmenuThumb', { fg = 'NONE', bg = c.vscPopupFront })
 --hl(0, 'VisualNOS', { bg = c.vscSelection })
 --hl(0, 'Character', { fg = c.vscOrange, bg = 'NONE' })
+--hl(0, 'Number', { fg = c.vscLightGreen, bg = 'NONE' })
 --hl(0, 'Boolean', { fg = c.vscBlue, bg = 'NONE' })
 --hl(0, 'Float', { fg = c.vscLightGreen, bg = 'NONE' })
 --hl(0, 'Conditional', { fg = c.vscPink, bg = 'NONE' })
@@ -352,10 +353,12 @@ return theme
 --hl(0, '@tag.delimiter', { fg = c.vscGray, bg = 'NONE' })
 --hl(0, '@tag.attribute', { fg = c.vscLightBlue, bg = 'NONE' })
 --
+--hl(0, '@text.title', { fg = isDark and c.vscBlue or c.vscYellowOrange, bold = true })
 --hl(0, '@text.literal', { fg = c.fg, bg = 'NONE' })
 --hl(0, '@text.literal.markdown', { fg = c.vscOrange, bg = 'NONE' })
 --hl(0, '@text.literal.markdown_inline', { fg = c.vscOrange, bg = 'NONE' })
 --hl(0, '@text.emphasis', { fg = c.fg, bg = 'NONE', italic = true })
+--hl(0, '@text.strong', { fg = isDark and c.vscBlue or c.vscViolet, bold = true })
 --hl(0, '@text.uri', { fg = c.fg, bg = 'NONE' })
 --hl(0, '@textReference', { fg = isDark and c.vscOrange or c.vscYellowOrange })
 --hl(0, '@punctuation.delimiter', { fg = c.fg, bg = 'NONE' })