added yank colors

README.md

@@ -1,6 +1,6 @@
 # Vim TCCS
 
-![colorscheme-example](tccs-example.jpg)
+![colorscheme-example](tccs-example.png)
 
 Tiyns custom color scheme (TCCS) for vim is an adaption of
 [Mofiquls vscode.nvim](https://github.com/Mofiqul/vscode.nvim) which is based upon colors from
@@ -13,12 +13,31 @@ This color scheme uses colors that match the ones of VSCode with strong red and
 yellow colors for errors and warnings.
 Additionally a darker background was added for better contrast.
 
+The example picture is taken with all settings available from my
+[dotfiles](https://github.com/tiyn/dotfiles).
+It is recommended to take a look into it to get similar highlighting, etc.
+
 ## Supported Plugins
 
 Following Plugins are especially supported by this color scheme.
 Other plugins may work as well, but don't are explicitly configured.
 
+- [Aerial.NVIM](https://github.com/stevearc/aerial.nvim/)
+- [Diffview](https://github.com/sindrets/diffview.nvim)
+- [GitSigns](https://github.com/lewis6991/gitsigns.nvim)
+- [LSP-Signature](https://github.com/ray-x/lsp_signature.nvim)
 - [Lualine](https://github.com/nvim-lualine/lualine.nvim)
+- [Modes.nvim](https://github.com/mvllow/modes.nvim)
+- [NavBuddy](https://github.com/SmiteshP/nvim-navbuddy)
+- [NVIM CMP](https://github.com/hrsh7th/nvim-cmp)
+- [NVIM Cursorword](https://github.com/xiyaowong/nvim-cursorword)
+- [NVIM Scrollbar](https://github.com/petertriho/nvim-scrollbar)
+- [NVIM Telescope](https://github.com/nvim-telescope/telescope.nvim)
+- [NVIM Tree](https://github.com/nvim-tree/nvim-tree.lua)
+- [NVIM Treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
+- [NVIM Ufo](https://github.com/kevinhwang91/nvim-ufo)
+- [VIM Illuminate](https://github.com/RRethy/vim-illuminate)
+- [Wilder](https://github.com/gelguy/wilder.nvim)
 
 ## Setup
 
@@ -32,7 +51,7 @@ Add the following line into the function `return require("lazy").setup({})` to l
   'tiyn/tccs.nvim',
   config = function()
     require('tccs').setup()
-    require('tccs').load()
+    vim.cmd('colorscheme tccs')
   end
 },
 ```

lua/lualine/themes/tccs.lua

@@ -3,44 +3,32 @@
 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 = line_c.bg_prim, bg = line_c.insert, gui = 'bold' },
-    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
-    c = { fg = line_c.fg_sec, bg = config.opts.transparent and 'NONE' or line_c.bg_prim },
+    a = { fg = c.line_bg, bg = c.line_normal, gui = 'bold' },
+    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    c = { fg = c.line_fg, bg = c.line_bg },
   },
   insert = {
-    a = { fg = line_c.bg_prim, bg = line_c.normal, gui = 'bold' },
-    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
+    a = { fg = c.line_bg, bg = c.line_insert, gui = 'bold' },
+    b = { fg = c.line_fg, bg = c.line_bg_alt },
   },
   visual = {
-    a = { fg = line_c.bg_prim, bg = line_c.visual, gui = 'bold' },
-    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
+    a = { fg = c.line_bg, bg = c.line_visual, gui = 'bold' },
+    b = { fg = c.line_fg, bg = c.line_bg_alt },
   },
   replace = {
-    a = { fg = line_c.bg_prim, bg = line_c.replace, gui = 'bold' },
-    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
+    a = { fg = c.line_bg, bg = c.line_replace, gui = 'bold' },
+    b = { fg = c.line_fg, bg = c.line_bg_alt },
   },
   command = {
-    a = { fg = line_c.bg_prim, bg = line_c.contrast, gui = 'bold' },
-    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
-    c = { fg = line_c.fg_sec, bg = config.opts.transparent and 'NONE' or line_c.bg_prim },
+    a = { fg = c.line_bg, bg = c.line_contrast, gui = 'bold' },
+    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    c = { fg = c.line_fg, bg = c.line_bg },
   },
   inactive = {
-    a = { fg = line_c.fg_prim, bg = line_c.bg_sec, gui = 'bold' },
-    b = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_sec },
-    c = { fg = line_c.fg_prim, bg = config.opts.transparent and 'NONE' or line_c.bg_prim },
+    a = { fg = c.line_fg, bg = c.line_bg_alt, gui = 'bold' },
+    b = { fg = c.line_fg, bg = c.line_bg_alt },
+    c = { fg = c.line_fg, bg = c.line_bg },
   },
 }

lua/tccs/colors.lua

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

lua/tccs/theme.lua

@@ -2,298 +2,327 @@ local hl = vim.api.nvim_set_hl
 local theme = {}
 
 theme.set_highlights = function(opts)
-  local c = require('tccs.colors').get_colors()
+  local c = require("tccs.colors").get_colors()
 
-  hl(0, 'Normal', { fg = c.fg, bg = c.bg })
-  hl(0, 'ColorColumn', { bg = c.line_alt })
-  hl(0, 'Cursor', { fg = c.tag })
-  hl(0, 'CursorLine', { bg = c.line })
-  hl(0, 'CursorColumn', { bg = c.line })
+  hl(0, "Normal", { fg = c.fg, bg = c.bg })
+  hl(0, "ColorColumn", { bg = c.color_column })
+  hl(0, "Cursor", { fg = c.cursor })
+  hl(0, "CursorLine", { bg = c.bg_alt })
+  hl(0, "CursorColumn", { bg = c.bg_alt })
 
-  hl(0, 'CursorLineNr', { fg = c.accent, bg = c.line })
-  hl(0, 'LineNr', { fg = c.guide_normal })
+  hl(0, "CursorLineNr", { fg = c.accent, bg = c.bg_alt })
+  hl(0, "LineNr", { fg = c.border })
 
-  hl(0, 'Directory', { fg = c.func })
+  hl(0, "Directory", { fg = c.func })
 
-  hl(0, 'ErrorMsg', { fg = c.fg, bg = c.error, standout = true })
+  hl(0, "ErrorMsg", { fg = c.fg, bg = c.error, standout = true })
 
-  hl(0, 'VertSplit', { fg = c.panel_bg, bg = c.panel_bg })
+  hl(0, "VertSplit", { fg = c.bg_alt, bg = c.bg_alt })
 
-  hl(0, 'Folded', { fg = c.fg_idle, bg = c.panel_bg })
-  hl(0, 'FoldColumn', { bg = c.panel_bg })
-  hl(0, 'SignColumn', { bg = c.panel_bg })
+  hl(0, "Folded", { fg = c.fg_idle, bg = c.bg })
+  hl(0, "FoldColumn", { bg = c.bg })
+  hl(0, "SignColumn", { bg = c.bg })
 
-  hl(0, 'MatchParen', { fg = c.fg, bg = c.bg, underline = true })
-  hl(0, 'ModeMsg', { fg = c.string })
-  hl(0, 'MoreMsg', { fg = c.string })
-  hl(0, 'NonText', { fg = c.guide_normal })
+  hl(0, "MatchParen", { fg = c.fg, bg = c.bg, underline = true })
+  hl(0, "ModeMsg", { fg = c.fg_alt })
+  hl(0, "MoreMsg", { fg = c.fg_alt })
+  hl(0, "NonText", { fg = c.border })
 
-  -- TODO: fix pmenu colors
-  hl(0, 'Pmenu', { fg = c.fg, bg = c.selection_inactive })
-  hl(0, 'PmenuSel', { fg = c.fg, bg = c.selection_inactive, reverse = true })
+  hl(0, "Pmenu", { fg = c.fg, bg = c.popup, ctermfg = 188, ctermbg = 235 })
+  hl(0, "PmenuSel", { fg = c.popup, bg = c.fg, ctermfg = 235, ctermbg = 188 })
 
-  hl(0, 'FloatBorder', { fg = c.fg, bg = c.selection_inactive })
-  hl(0, 'Question', { fg = c.string })
-  hl(0, 'Search', { fg = c.bg, bg = c.constant })   -- TODO: fix color
-  hl(0, 'SpecialKey', { fg = c.selection_inactive })
+  hl(0, "FloatBorder", { fg = c.fg, bg = c.popup })
+  hl(0, "Question", { fg = c.fg_alt })
+  hl(0, "Search", { fg = c.bg, bg = c.fg_alt })
+  hl(0, "SpecialKey", { fg = c.popup })
 
-  hl(0, 'SpellCap', { fg = c.tag, undercurl = true, sp = c.error })
-  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.regexp, undercurl = true, sp = c.error })
+  hl(0, "SpellCap", { fg = c.warning, undercurl = true, sp = c.error })
+  hl(0, "SpellLocal", { fg = c.warning, 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, 'StatusLine', { fg = c.fg, bg = c.panel_bg })
-  hl(0, 'StatusLineNC', { fg = c.fg_idle, bg = c.panel_bg })
+  hl(0, "StatusLine", { fg = c.fg, bg = c.bg_alt })
+  hl(0, "StatusLineNC", { fg = c.fg_idle, bg = c.bg_alt })
 
-  hl(0, 'WildMenu', { fg = c.fg, bg = c.markup })   -- TODO: fix color
+  hl(0, "WildMenu", { fg = c.fg, bg = c.popup })
 
-  hl(0, 'TabLine', { fg = c.comment, bg = c.panel_shadow })
-  hl(0, 'TabLineFill', { fg = c.fg, bg = c.panel_border })
-  hl(0, 'TabLineSel', { fg = c.fg, bg = c.bg })
+  hl(0, "TabLine", { fg = c.accent_alt, bg = c.bg_alt })
+  hl(0, "TabLineFill", { fg = c.fg, bg = c.popup })
+  hl(0, "TabLineSel", { fg = c.fg, bg = c.bg })
 
-  hl(0, 'Title', { fg = c.keyword, bold = true })
-
-  hl(0, 'Visual', { bg = c.selection_inactive })
-
-  hl(0, 'WarningMsg', { fg = c.warning, bold = true })
+  hl(0, "Visual", { bg = c.popup })
 
   -- syntax
-  hl(0, 'Comment', { fg = c.comment, italic = opts.italic_comments })
-  hl(0, 'Constant', { fg = c.constant })
-  hl(0, 'String', { fg = c.string })
-  hl(0, 'Identifier', { fg = c.entity })
-  hl(0, 'Function', { fg = c.func })
-  hl(0, 'Statement', { fg = c.keyword })
-  hl(0, 'Operator', { fg = c.operator })
-  hl(0, 'Exception', { fg = c.markup })
-  hl(0, 'PreProc', { fg = c.accent })
-  hl(0, 'Type', { fg = c.entity })
-  hl(0, 'Structure', { 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, "Title", { fg = c.bold, bold = true })
+  hl(0, "Comment", { fg = c.comment, italic = opts.italic_comments })
+  hl(0, "Constant", { fg = c.constant })
+  hl(0, "String", { fg = c.string })
+  hl(0, "Identifier", { fg = c.entity })
+  hl(0, "Function", { fg = c.func })
+  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, "Type", { fg = c.entity })
+  hl(0, "Structure", { fg = c.special })
+  hl(0, "Special", { fg = c.special })
+  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.keyword })
-  hl(0, 'Conceal', { fg = c.comment })
-  hl(0, 'CursorLineConceal', { fg = c.guide_normal, bg = c.line })
+  hl(0, "qfLineNr", { fg = c.accent })
+  hl(0, "Conceal", { fg = c.accent_alt })
+  hl(0, "CursorLineConceal", { fg = c.border, bg = c.bg_alt })
 
   -- diff syntax highlighting
-  hl(0, 'DiffAdd', { fg = c.vcs_added, bg = c.guide_normal })
-  hl(0, 'diffAdded', { link = 'DiffAdd' })
-  hl(0, 'DiffChange', { fg = c.vcs_modified, bg = c.guide_normal })
-  hl(0, 'DiffDelete', { fg = c.vcs_removed, bg = c.guide_normal })
-  hl(0, 'diffRemoved', { link = 'DiffDelete' })
-  hl(0, 'DiffText', { fg = c.vcs_modified, bg = c.guide_active })
+  hl(0, "DiffAdd", { bg = c.added_bg })
+  hl(0, "diffAdded", { link = "DiffAdd" })
+  hl(0, "DiffChange", { bg = c.modified_bg })
+  hl(0, "DiffDelete", { bg = c.removed_bg })
+  hl(0, "diffRemoved", { link = "DiffDelete" })
+  hl(0, "DiffText", { bg = c.modified_fg_alt })
 
   -- netrw
-  hl(0, 'netrwClassify', { fg = c.special })
+  hl(0, "netrwClassify", { fg = c.fg_alt })
 
   -- gitgutter
-  hl(0, 'GitGutterAdd', { fg = c.vcs_added, bg = c.panel_bg })
-  hl(0, 'GitGutterChange', { fg = c.vcs_modified, bg = c.panel_bg })
-  hl(0, 'GitGutterDelete', { fg = c.vcs_removed, bg = c.panel_bg })
-  hl(0, 'GitGutterChangeDelete', { fg = c.vcs_modified, bg = c.panel_bg, underline = true })
+  hl(0, "GitGutterAdd", { fg = c.added_fg, bg = c.bg })
+  hl(0, "GitGutterChange", { fg = c.modified_fg, bg = c.bg })
+  hl(0, "GitGutterDelete", { fg = c.removed_fg, bg = c.bg })
+  hl(0, "GitGutterChangeDelete", { fg = c.modified_fg, bg = c.bg, underline = true })
 
   -- signify
-  hl(0, 'SignifySignAdd', { fg = c.vcs_added, bg = c.panel_bg })
-  hl(0, 'SignifySignChange', { fg = c.vcs_modified, bg = c.panel_bg })
-  hl(0, 'SignifySignDelete', { fg = c.vcs_removed, bg = c.panel_bg })
-  hl(0, 'SignifySignChangeDelete', { fg = c.vcs_modified, bg = c.panel_bg, underline = true })
+  hl(0, "SignifySignAdd", { fg = c.added_fg, bg = c.bg })
+  hl(0, "SignifySignChange", { fg = c.modified_fg, bg = c.bg })
+  hl(0, "SignifySignDelete", { fg = c.removed_fg, bg = c.bg })
+  hl(0, "SignifySignChangeDelete", { fg = c.modified_fg, bg = c.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.func })
-  hl(0, 'NERDTreeFile', {})
-  hl(0, 'NERDTreeDirSlash', { fg = c.special })
+  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, "NERDTreeFile", {})
+  hl(0, "NERDTreeDirSlash", { fg = c.fg_alt })
 
   -- telescope
-  hl(0, 'TelescopeMatching', { fg = c.accent, bold = true })
-  hl(0, 'TelescopePromptBorder', { fg = c.guide_normal })
-  hl(0, 'TelescopeResultsBorder', { fg = c.guide_normal })
-  hl(0, 'TelescopePreviewBorder', { fg = c.guide_normal })
-  hl(0, 'TelescopeNormal', { fg = c.fg })
-  hl(0, 'TelescopeSelection', { fg = c.fg, bg = c.vscPopupHighlightBlue })
-  hl(0, 'TelescopeMultiSelection', { fg = c.fg, bg = c.vscPopupHighlightBlue })
-  hl(0, 'TelescopePromptPrefix', { fg = c.fg, bg = 'NONE' })
+  hl(0, "TelescopeMatching", { fg = c.accent, bold = true })
+  hl(0, "TelescopePromptBorder", { fg = c.border })
+  hl(0, "TelescopeResultsBorder", { fg = c.border })
+  hl(0, "TelescopePreviewBorder", { fg = c.border })
+  hl(0, "TelescopeNormal", { fg = c.fg })
+  hl(0, "TelescopeSelection", { fg = c.bg, bg = c.fg })
+  hl(0, "TelescopeMultiSelection", { fg = c.bg, bg = c.fg })
+  hl(0, "TelescopePromptPrefix", { fg = c.fg, bg = "NONE" })
 
-  -- 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.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.panel_bg })
-  hl(0, 'DiagnosticVirtualTextHint', { fg = c.comment })
-  hl(0, 'DiagnosticSignHint', { fg = c.comment })
-  hl(0, 'DiagnosticHint', { fg = c.comment })
-  hl(0, 'DiagnosticVirtualTextInfo', { fg = c.fg })
-  hl(0, 'DiagnosticSignInfo', { fg = c.fg })
-  hl(0, 'DiagnosticInfo', { fg = c.fg })
+  -- diagnostics
+  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, "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, "DiagnosticVirtualTextHint", { fg = c.hint })
+  hl(0, "DiagnosticSignHint", { fg = c.hint })
+  hl(0, "DiagnosticHint", { fg = c.hint })
+  hl(0, "DiagnosticVirtualTextInfo", { fg = c.fg })
+  hl(0, "DiagnosticSignInfo", { fg = c.fg })
+  hl(0, "DiagnosticInfo", { fg = c.fg })
 
-  -- yats
-  hl(0, 'typescriptDecorator', { fg = c.markup })
-  hl(0, 'typescriptImport', { fg = c.accent })
-  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 })
-  hl(0, 'typescriptTernaryOp', { fg = c.operator })
-  hl(0, 'typescriptModule', { fg = c.keyword })
-  hl(0, 'typescriptTypeBrackets', { fg = c.special })
-  hl(0, 'typescriptClassName', { fg = c.tag })
-  hl(0, 'typescriptAmbientDeclaration', { fg = c.keyword })
-  hl(0, 'typescriptRegextString', { fg = c.regexp })
-  hl(0, 'typescriptTry', { fg = c.markup })
-  hl(0, 'typescriptExceptions', { fg = c.markup })
-  hl(0, 'typescriptDebugger', { fg = c.markup, bold = true })
-  hl(0, 'typescriptParens', { fg = c.special })
-  hl(0, 'typescriptVariable', { fg = c.keyword })
-  hl(0, 'typescriptObjectLabel', { fg = c.tag })
-  hl(0, 'typescriptOperator', { fg = c.keyword })
-  hl(0, 'typescriptArrowFunc', { fg = c.operator })
-  hl(0, 'typescriptBraces', { fg = c.special })
-  hl(0, 'typescriptGlobal', { fg = c.accent })
-  hl(0, 'typescriptDOMFormProp', { fg = c.entity })
-  hl(0, 'typescriptDOMEventProp', { fg = c.entity })
-  hl(0, 'typescriptBOMWindowProp', { fg = c.accent })
-  hl(0, 'typescriptDateMethod', { fg = c.func })
-  hl(0, 'typescriptBlobMethod', { fg = c.func })
-  hl(0, 'typescriptArrayMethod', { fg = c.func })
-  hl(0, 'typescriptArrayStaticMethod', { fg = c.func })
-  hl(0, 'typescriptStringMethod', { fg = c.func })
-  hl(0, 'typescriptPaymentMethod', { fg = c.func })
-  hl(0, 'typescriptHeadersMethod', { fg = c.func })
-  hl(0, 'typescriptCacheMethod', { fg = c.func })
-  hl(0, 'typescriptDOMEEventMethod', { fg = c.func })
-  hl(0, 'typescriptDOMEEventTargetMethod', { fg = c.func })
-  hl(0, 'typescriptBOMWindowMethod', { fg = c.func })
-  hl(0, 'typescriptDOMStorageMethod', { fg = c.func })
-  hl(0, 'typescriptPromiseMethod', { fg = c.func })
-  hl(0, 'typescriptGlobalMethod', { fg = c.func })
-  hl(0, 'typescriptFunctionMethod', { fg = c.func })
-  hl(0, 'typescriptBOMLocationMethod', { fg = c.func })
+  hl(0, "WarningMsg", { fg = c.warning, bold = true })
+
+  -- typescript
+  hl(0, "typescriptDecorator", { fg = c.markup })
+  hl(0, "typescriptImport", { fg = c.keyword })
+  hl(0, "typescriptExport", { fg = c.keyword })
+  hl(0, "typescriptIdentifier", { fg = c.tag, italic = opts.italic_comments })
+  hl(0, "typescriptAssign", { fg = c.operator })
+  hl(0, "typescriptBinaryOp", { fg = c.operator })
+  hl(0, "typescriptTernaryOp", { fg = c.operator })
+  hl(0, "typescriptModule", { fg = c.keyword })
+  hl(0, "typescriptTypeBrackets", { fg = c.special })
+  hl(0, "typescriptClassName", { fg = c.tag })
+  hl(0, "typescriptAmbientDeclaration", { fg = c.keyword })
+  hl(0, "typescriptRegextString", { fg = c.regexp })
+  hl(0, "typescriptTry", { fg = c.markup })
+  hl(0, "typescriptExceptions", { fg = c.markup })
+  hl(0, "typescriptDebugger", { fg = c.markup, bold = true })
+  hl(0, "typescriptParens", { fg = c.special })
+  hl(0, "typescriptVariable", { fg = c.keyword })
+  hl(0, "typescriptObjectLabel", { fg = c.tag })
+  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, "typescriptDOMFormProp", { fg = c.entity })
+  hl(0, "typescriptDOMEventProp", { fg = c.entity })
+  hl(0, "typescriptBOMWindowProp", { fg = c.keyword })
+  hl(0, "typescriptDateMethod", { fg = c.func })
+  hl(0, "typescriptBlobMethod", { fg = c.func })
+  hl(0, "typescriptArrayMethod", { fg = c.func })
+  hl(0, "typescriptArrayStaticMethod", { fg = c.func })
+  hl(0, "typescriptStringMethod", { fg = c.func })
+  hl(0, "typescriptPaymentMethod", { fg = c.func })
+  hl(0, "typescriptHeadersMethod", { fg = c.func })
+  hl(0, "typescriptCacheMethod", { fg = c.func })
+  hl(0, "typescriptDOMEEventMethod", { fg = c.func })
+  hl(0, "typescriptDOMEEventTargetMethod", { fg = c.func })
+  hl(0, "typescriptBOMWindowMethod", { fg = c.func })
+  hl(0, "typescriptDOMStorageMethod", { fg = c.func })
+  hl(0, "typescriptPromiseMethod", { fg = c.func })
+  hl(0, "typescriptGlobalMethod", { fg = c.func })
+  hl(0, "typescriptFunctionMethod", { fg = c.func })
+  hl(0, "typescriptBOMLocationMethod", { fg = c.func })
 
   -- javascript
-  hl(0, 'jsNull', { fg = c.constant })
-  hl(0, 'jsThis', { fg = c.constant, italic = opts.italic_comments })
-  hl(0, 'jsBrackets', { fg = c.special })
-  hl(0, 'jsDot', { fg = c.special })
-  hl(0, 'jsParens', { fg = c.special })
-  hl(0, 'jsFuncParens', { fg = c.special })
-  hl(0, 'jsFuncBraces', { fg = c.special })
-  hl(0, 'jsIfElseBraces', { fg = c.special })
-  hl(0, 'jsObjectKey', { fg = c.tag })
-  hl(0, 'jsObjectProp', { fg = c.tag })
-  hl(0, 'jsRegexpString', { fg = c.regexp })
-  hl(0, 'jsStorageClass', { fg = c.keyword })
-  hl(0, 'jsArrowFunction', { fg = c.operator })
+  hl(0, "jsNull", { fg = c.constant })
+  hl(0, "jsThis", { fg = c.constant, italic = opts.italic_comments })
+  hl(0, "jsBrackets", { fg = c.special })
+  hl(0, "jsDot", { fg = c.special })
+  hl(0, "jsParens", { fg = c.special })
+  hl(0, "jsFuncParens", { fg = c.special })
+  hl(0, "jsFuncBraces", { fg = c.special })
+  hl(0, "jsIfElseBraces", { fg = c.special })
+  hl(0, "jsObjectKey", { fg = c.tag })
+  hl(0, "jsObjectProp", { fg = c.tag })
+  hl(0, "jsRegexpString", { fg = c.regexp })
+  hl(0, "jsStorageClass", { fg = c.keyword })
+  hl(0, "jsArrowFunction", { fg = c.operator })
 
   -- treesitter
-  hl(0, '@include', { fg = c.accent })
-  hl(0, '@parameter', { fg = c.special })
-  hl(0, '@field', { fg = c.tag })
-  hl(0, '@property', { fg = c.tag })
-  hl(0, '@attribute', { fg = c.markup })
-  hl(0, '@variable.builtin', { fg = c.constant, italic = opts.italic_comments })
-  hl(0, '@constant.builtin', { fg = c.constant })
-  hl(0, '@string.regex', { fg = c.regexp })
-  hl(0, '@function.macro', { fg = c.func })
-
+  hl(0, "@include", { fg = c.keyword })
+  hl(0, "@parameter", { fg = c.special })
+  hl(0, "@field", { fg = c.tag })
+  hl(0, "@property", { fg = c.tag })
+  hl(0, "@attribute", { fg = c.markup })
+  hl(0, "@variable.builtin", { fg = c.constant, italic = opts.italic_comments })
+  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 })
-  hl(0, 'fugitiveUnstagedHeading', { fg = c.accent })
-  hl(0, 'fugitiveStagedHeading', { fg = c.accent })
-  hl(0, 'fugitiveHeading', { fg = c.accent })
+  hl(0, "fugitiveUntrackedHeading", { fg = c.accent })
+  hl(0, "fugitiveUnstagedHeading", { fg = c.accent })
+  hl(0, "fugitiveStagedHeading", { fg = c.accent })
+  hl(0, "fugitiveHeading", { fg = c.accent })
 
   -- git commit
-  hl(0, 'gitcommitBranch', { fg = c.func })
-  hl(0, 'gitcommitHeader', { fg = c.accent })
-  hl(0, 'gitcommitSummary', { fg = c.fg })
-  hl(0, 'gitcommitOverflow', { fg = c.markup })
+  hl(0, "gitcommitBranch", { fg = c.ui })
+  hl(0, "gitcommitHeader", { fg = c.accent })
+  hl(0, "gitcommitSummary", { fg = c.fg })
+  hl(0, "gitcommitOverflow", { fg = c.accent })
 
   -- startify
-  hl(0, 'StartifyFile', { fg = c.fg })
+  hl(0, "StartifyFile", { fg = c.fg })
 
   -- vim
-  hl(0, 'vimUserfunc', { fg = c.func })
-  hl(0, 'vimFunction', { fg = c.func })
-  hl(0, 'vimIsCommand', {})
+  hl(0, "vimUserfunc", { fg = c.func })
+  hl(0, "vimFunction", { fg = c.func })
+  hl(0, "vimIsCommand", {})
 
   -- xml
-  hl(0, 'xmlTag', { fg = c.special })
-  hl(0, 'xmlTagName', { fg = c.keyword })
-  hl(0, 'xmlEntity', { fg = c.tag })
-  hl(0, 'xmlEntityPunct', { fg = c.operator })
-  hl(0, 'xmlEqual', { fg = c.operator })
+  hl(0, "xmlTag", { fg = c.special })
+  hl(0, "xmlTagName", { fg = c.keyword })
+  hl(0, "xmlEntity", { fg = c.tag })
+  hl(0, "xmlEntityPunct", { fg = c.operator })
+  hl(0, "xmlEqual", { fg = c.operator })
 
   -- ini
-  hl(0, 'dosiniHeader', { fg = c.keyword })
+  hl(0, "dosiniHeader", { fg = c.keyword })
 
   -- pandoc
-  hl(0, 'pandocPipeTableHeader', { fg = c.keyword })
-  hl(0, 'pandocPipeTableDelims', { fg = c.keyword })
-  hl(0, 'pandocDelimitedCodeBlock', { fg = c.accent })
+  hl(0, "pandocPipeTableHeader", { fg = c.keyword })
+  hl(0, "pandocPipeTableDelims", { fg = c.keyword })
+  hl(0, "pandocDelimitedCodeBlock", { fg = c.keyword })
 
   -- shell
-  hl(0, 'shTestOpr', { fg = c.operator })
-  hl(0, 'shOption', { fg = c.special })
-  hl(0, 'shQuote', { fg = c.string })
+  hl(0, "shTestOpr", { fg = c.operator })
+  hl(0, "shOption", { fg = c.special })
+  hl(0, "shQuote", { fg = c.string })
 
-  -- shell
-  hl(0, 'haskellDeclKeyword', { fg = c.keyword })
-  hl(0, 'haskellLet', { fg = c.keyword })
-  hl(0, 'haskellWhere', { fg = c.keyword })
-  hl(0, 'haskellIdentifier', { fg = c.tag })
+  -- haskell
+  hl(0, "haskellDeclKeyword", { fg = c.keyword })
+  hl(0, "haskellLet", { fg = c.keyword })
+  hl(0, "haskellWhere", { fg = c.keyword })
+  hl(0, "haskellIdentifier", { fg = c.tag })
 
   -- php
-  hl(0, 'phpDefine', { fg = c.keyword })
-  hl(0, 'phpStructure', { fg = c.keyword })
+  hl(0, "phpDefine", { fg = c.keyword })
+  hl(0, "phpStructure", { fg = c.keyword })
 
   -- ruby
-  hl(0, 'rubyModule', { fg = c.keyword })
-  hl(0, 'rubyRegexp', { fg = c.regexp })
-  hl(0, 'rubyRegexpDelimiter', { fg = c.regexp })
-  hl(0, 'rubyStringDelimiter', { fg = c.string })
+  hl(0, "rubyModule", { fg = c.keyword })
+  hl(0, "rubyRegexp", { fg = c.regexp })
+  hl(0, "rubyRegexpDelimiter", { fg = c.regexp })
+  hl(0, "rubyStringDelimiter", { fg = c.string })
 
   -- nvimtree
-  hl(0, 'NvimTreeRootFolder', { fg = c.fg, bold = true })
-  hl(0, 'NvimTreeGitDirty', { fg = c.vcs_modified })
-  hl(0, 'NvimTreeGitNew', { fg = c.vcs_added })
-  hl(0, 'NvimTreeImageFile', { fg = c.keyword })
-  hl(0, 'NvimTreeEmptyFolderName', { fg = c.ui })
-  hl(0, 'NvimTreeFolderName', { fg = c.fg })
-  hl(0, 'NvimTreeSpecialFile', { fg = c.keyword, underline = true })
-  hl(0, 'NvimTreeNormal', { fg = c.fg })
-  hl(0, 'NvimTreeCursorLine', {})
-  hl(0, 'NvimTreeVertSplit', { bg = c.bg })
-  hl(0, 'NvimTreeEndOfBuffer', {})
-  hl(0, 'NvimTreeOpenedFolderName', {})
-  hl(0, 'NvimTreeGitRenamed', { fg = c.vcs_modified })
-  hl(0, 'NvimTreeGitIgnored', { fg = c.ui })
-  hl(0, 'NvimTreeGitDeleted', { fg = c.vcs_removed })
-  hl(0, 'NvimTreeGitStaged', { fg = c.vcs_added })
-  hl(0, 'NvimTreeGitMerge', { fg = c.error })
-  hl(0, 'NvimTreeGitDirty', { fg = c.vcs_modified })
-  hl(0, 'NvimTreeGitNew', { fg = c.vcs_added })
+  hl(0, "NvimTreeRootFolder", { fg = c.fg, bold = true })
+  hl(0, "NvimTreeGitDirty", { fg = c.modified_fg })
+  hl(0, "NvimTreeGitNew", { fg = c.added_fg })
+  hl(0, "NvimTreeImageFile", { fg = c.accent })
+  hl(0, "NvimTreeEmptyFolderName", { fg = c.ui })
+  hl(0, "NvimTreeFolderName", { fg = c.fg })
+  hl(0, "NvimTreeSpecialFile", { fg = c.accent, underline = true })
+  hl(0, "NvimTreeNormal", { fg = c.fg })
+  hl(0, "NvimTreeCursorLine", {})
+  hl(0, "NvimTreeVertSplit", { bg = c.bg_alt })
+  hl(0, "NvimTreeEndOfBuffer", {})
+  hl(0, "NvimTreeOpenedFolderName", {})
+  hl(0, "NvimTreeGitRenamed", { fg = c.modified_fg })
+  hl(0, "NvimTreeGitIgnored", { fg = c.ui })
+  hl(0, "NvimTreeGitDeleted", { fg = c.removed_fg })
+  hl(0, "NvimTreeGitStaged", { fg = c.added_fg })
+  hl(0, "NvimTreeGitMerge", { fg = c.modified_fg })
+  hl(0, "NvimTreeGitDirty", { fg = c.modified_fg })
+  hl(0, "NvimTreeGitNew", { fg = c.added_fg })
+
+  -- nvim-cursorword
+  hl(0, "CursorWord", { underline = true })
+
+  -- markup
+  hl(0, "@text", { fg = c.fg }) -- Legacy
+  hl(0, "@markup.strong", { fg = c.bold, bold = true })
+  hl(0, "@markup.italic", { fg = c.fg, italic = true })
+  hl(0, "@markup.underline", { fg = c.fg, bg = "NONE" })
+  hl(0, "@markup.strikethrough", { fg = c.fg, strikethrough = true })
+  hl(0, "@markup.heading", { fg = c.bold, bold = true })
+  hl(0, "@markup.raw", { fg = c.fg })
+  hl(0, "@markup.raw.markdown", { fg = c.string })
+  hl(0, "@markup.raw.markdown_inline", { fg = c.string })
+  hl(0, "@markup.link.label", { fg = c.tag })
+  hl(0, "@markup.link.url", { fg = c.string })
+  hl(0, "@markup.list.checked", { link = "Todo" })
+  hl(0, "@markup.list.unchecked", { link = "Todo" })
+  hl(0, "@textReference", { fg = c.tag })
+  hl(0, "@stringEscape", { fg = c.string, bold = true })
+
+  -- modes.nvim
+  hl(0, "ModesCopy", { bg = c.yank_fg })
+  hl(0, "ModesDelete", { bg = c.removed_fg })
+  hl(0, "ModesInsert", { bg = c.added_fg })
+  hl(0, "ModesVisual", { bg = c.visual_fg })
+
+  -- highlighting on yank
+  hl(0, "YankHighlight", { bg = c.yank_fg })
+  hl(0, "TextYankPost", { bg = c.yank_fg })
+
 end
 
 return theme
 
-
 --hl(0, 'EndOfBuffer', { fg = c.bg, bg = 'NONE' })
 --hl(0, 'IncSearch', { fg = c.vscNone, bg = c.vscSearchCurrent })
 --hl(0, 'PmenuSbar', { fg = 'NONE', bg = c.vscPopupHighlightGray })
 --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' })
@@ -353,12 +382,10 @@ 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' })