Merge remote-tracking branch 'upstream/main'HEADmaster

248 files changed, 80187 insertions, 14824 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..dc0e021
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[Bug report] "
+labels: ["bug"]
+assignees: 
+  - base16-project/vim
+---
+
+## Describe the bug
+
+<!-- A clear and concise description of what the bug is. -->
+
+## Expected behavior
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+## Screenshots
+
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+## **System**
+
+**Vim or Neovim:**
+
+**Vim or Neovim version:**
+
+**Any other plugins you may consider relevant:**
+
+## Minimal configuration file
+
+<!-- Add a minimal configuration file to dramatically increase your
+chances of receiving help from a maintainer. -->
+
+## Additional context
+
+<!-- Add any other context about the problem here. -->
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..d9b663b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature request] "
+labels: ["feature"]
+assignees: 
+  - base16-project/vim
+---
+
+## Is your feature request related to a problem? Please describe.
+
+<!-- A clear and concise description of what the problem is. -->
+
+## Describe the solution you'd like
+
+<!-- A clear and concise description of what you want to happen. -->
+
+## Describe alternatives you've considered
+
+<!-- A clear and concise description of any alternative solutions or
+features you've considered. -->
+
+## Additional context
+
+<!-- Add any other context or screenshots about the feature request
+here. -->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..0838e1d
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,13 @@
+# Description
+
+<!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. -->
+
+Fixes #ISSUE_NUMBER
+
+# Checklist
+
+- [ ] I have built the project after my changes following [the build
+  instructions](https://github.com/base16-project/base16-vim/blob/main/CONTRIBUTING.md#building)
+  using `make`
+- [ ] I have confirmed that my changes produce no regressions after building
+- [ ] I have pushed the built files to this pull request
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 0000000..7d412ae
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,23 @@
+name: Check that running `make` does not produce additional changes
+on:
+  pull_request:
+    branches:
+      - master
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Upgrade pip
+        run: python -m pip install --upgrade pip
+      - name: Install pybase16
+        run: pip install pybase16-builder
+      - name: Fetch the repository code
+        uses: actions/checkout@v2
+      - name: Run make
+        run: make
+      - name: Check if there are changes
+        run: git diff --exit-code
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
new file mode 100644
index 0000000..b18b58a
--- /dev/null
+++ b/.github/workflows/update.yml
@@ -0,0 +1,30 @@
+name: Update with the latest base16-project/base16-schemes
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 0" # https://crontab.guru/every-week
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch the repository code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.BOT_ACCESS_TOKEN }}
+      - name: Fetch the schemes repository
+        uses: actions/checkout@v3
+        with:
+          repository: base16-project/base16-schemes
+          path: schemes
+          token: ${{ secrets.BOT_ACCESS_TOKEN }}
+      - name: Update schemes
+        uses: base16-project/base16-builder-go@latest
+      - name: Commit the changes, if any
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update with the latest base16-project colorschemes
+          branch: ${{ github.head_ref }}
+          commit_user_name: base16-project-bot
+          commit_user_email: base16themeproject@proton.me
+          commit_author: base16-project-bot <base16themeproject@proton.me>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9de291b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+schemes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..9f459b1
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,67 @@
+# Contributing
+
+This repository includes a [GitHub Action][4] that builds the
+colorschemes once a week. This keeps the colorschemes up-to-date
+automatically.
+
+## Building
+
+### Dependencies
+
+- `>=0.2.0` [base16-builder-go][1]
+- golang `>=1.16` to build base16-builder-go
+
+### Usage for template editing
+
+1. Clone [base16-builder-go][1] somewhere on your system.
+1. Run `cd /path/to/base-builder-go && go build` to generate a binary:
+`/path/to/base-builder-go/base16-builder-go`
+1. Now execute the binary you generated while giving the `-template-dir`
+arg the path to `base16-vim` repository: `./base16-builder-go
+-template-dir ../base16-vim`
+
+Or the above steps represented in shell commands:
+
+```shell 
+cd /path/to/base16-vim/../ # This repos parent dir 
+git clone git@github.com:base16-project/base16-builder-go.git
+cd base16-builder-go
+go build ./base16-builder-go/base16-builder-go \
+  -template-dir ../base16-vim
+```
+
+### Usage for adding or editing a colorscheme
+
+If you want to add or edit a colorscheme but want to test it out, you
+simply need to pass in your local [base16-schemes][2] directory when
+executing the `base16-builder-go` binary.
+
+```shell
+base16-builder-go \
+  -schemes-dir /path/to/base16-schemes \
+  -template-dir /path/to/base16-vim
+```
+
+If you have more questions about [base16-builder-go][1], have a look at
+the information on the GitHub page.
+
+## Submitting a PR
+
+- Run the colorscheme generation using [base16-builder-go][1] and commit
+  the changes in your PR. Don't make changes directly to the generated
+  colorschemes, make changes to the template instead.
+- Please abide by what's requested in the [PR template][4].
+
+## Submitting an issue
+
+Please follow the instructions in the issue templates:
+
+- [Issue template for bug reports][5]
+- [Issue template for feature requests][6]
+
+[1]: https://github.com/base16-project/base16-builder-go
+[2]: https://github.com/base16-project/base16-schemes
+[3]: .github/workflows/update.yml
+[4]: .github/pull_request_template.md
+[5]: .github/ISSUE_TEMPLATE/bug_report.md
+[6]: .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/LICENSE.md b/LICENSE.md
index e04b766..4fd2ecf 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -3,7 +3,8 @@
 Base16 Vim is released under the MIT License:
 
 > Copyright (C) 2012 [Chris Kempson](http://chriskempson.com)
-> 
+> Copyright (C) 2021 [Fausto Núñez Alberro](https://fnune.com/)
+>
 > Permission is hereby granted, free of charge, to any person obtaining
 > a copy of this software and associated documentation files (the
 > "Software"), to deal in the Software without restriction, including
@@ -11,10 +12,10 @@ Base16 Vim is released under the MIT License:
 > distribute, sublicense, and/or sell copies of the Software, and to
 > permit persons to whom the Software is furnished to do so, subject to
 > the following conditions:
-> 
+>
 > The above copyright notice and this permission notice shall be
 > included in all copies or substantial portions of the Software.
-> 
+>
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 > EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 > MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
diff --git a/README.md b/README.md
index 98611b7..8c34608 100644
--- a/README.md
+++ b/README.md
@@ -1,72 +1,125 @@
 # Base16 Vim
-See the [Base16 repository](https://github.com/chriskempson/base16) for more information.  
-This theme was built with [Base16 Builder PHP](https://github.com/chriskempson/base16-builder-php).
+
+Supports console [Vim][1], graphical Vim and [Neovim][2].
 
 Supports graphical Vim and console Vim.
 
-![Base16 Vim](https://raw.github.com/chriskempson/base16-vim/master/base16-vim.png)
+Over [200 themes][3] plus light/dark variations are available. Here are
+some of our favorites:
+
+The `classic-dark` theme:
+
+![base16-vim classic-dark][10]
+
+The `horizon-dark` theme:
+
+![base16-vim horizon-dark][11]
+
+The `onedark` theme:
+
+![base16-vim onedark][12]
 
 ## Terminal Themes
-For terminal Vim (non-gui) please ensure you are using a base16 terminal theme.
 
-* [iTerm2](https://github.com/chriskempson/base16-iterm2)
+For terminal Vim (non-gui) please ensure you are using a base16 terminal
+theme. Have a look at the list of [official][4] and [unofficial][5]
+themes for your terminal of choice.
 
 ## Installation
 
 Add `colorscheme base16-default-dark` to your `~/.vimrc`.
 
 ### Vundle
+
 Add the following to your `~/.vimrc` file and run `PluginInstall` in Vim.
 
-    Plugin 'chriskempson/base16-vim'
+```vim
+Plugin 'base16-project/base16-vim'
+```
 
 ### vim-plug
+
 Add the following to your `~/.vimrc` file and run `PlugInstall` in Vim.
 
-    Plug 'chriskempson/base16-vim'
+```vim
+Plug 'base16-project/base16-vim'
+```
 
 ### Pathogen
 
-    cd ~/.vim/bundle
-    git clone https://github.com/chriskempson/base16-vim.git
+```bash
+cd ~/.vim/bundle
+git clone https://github.com/base16-project/base16-vim.git
+```
 
 ### Manual
 
-    cd ~/.vim/colors
-    git clone git://github.com/chriskempson/base16-vim.git base16
-    cp base16/colors/*.vim .
-    
-## 256 colorspace 
-If using a Base16 terminal theme designed to keep the 16 ANSI colors intact (a "256" variation) **and** have sucessfully modified your 256 colorspace with [base16-shell](https://github.com/chriskempson/base16-shell) you'll need to add the following to your `~/.vimrc` **before** the colorsheme declaration.
+```bash
+cd ~/.vim/colors
+git clone git://github.com/base16-project/base16-vim.git base16
+cp base16/colors/*.vim .
+```
+
+### Manual neovim
+
+```bash
+cd ~/.config/nvim/colors
+git clone git://github.com/base16-project/base16-vim.git base16
+cp base16/colors/*.vim .
+```
 
-    let base16colorspace=256  " Access colors present in 256 colorspace
+## 256 colorspace
 
-This will cause vim to access the colours in the modified 256 colorspace. Please **do not** enable this simply because you have a 256 color terminal as this will cause colors to be displayed incorrectly. 
+If using a Base16 terminal theme designed to keep the 16 ANSI colors
+intact (a "256" variation) **and** have sucessfully modified your 256
+colorspace with [base16-shell][6] you'll need to add the following to
+your `~/.vimrc` **before** the colorsheme declaration.
+
+```vim
+let base16colorspace=256  " Access colors present in 256 colorspace
+```
+
+This will cause vim to access the colours in the modified 256
+colorspace. Please **do not** enable this simply because you have a 256
+color terminal as this will cause colors to be displayed incorrectly.
 
 ## Troubleshooting
-There is a script to help troubleshoot colour issues called `colortest` available in the [Base16 Shell](https://github.com/chriskempson/base16-shell) repository.
 
-If you are using a ISO-8613-3 compatible terminal (
-[vim docs](https://github.com/vim/vim/blob/23c1b2b018c8121ca5fcc247e37966428bf8ca66/runtime/doc/options.txt#L7876),
-[neovim docs](https://neovim.io/doc/user/options.html#'termguicolors')), and
-you see a green or blue line, try to enable `termguicolors`:
+There is a script to help troubleshoot colour issues called `colortest`
+available in the [Base16 Shell][6] repository.
+
+If you are using a ISO-8613-3 compatible terminal ([vim docs][7],
+[neovim docs][8]), and you see a green or blue line, try to enable
+`termguicolors`:
 
 ```vim
 set termguicolors
 ```
 
 ### Green line numbers
-![green line numbers screenshot](https://raw.github.com/chriskempson/base16-vim/master/without-base16colorspace-256-with-256-terminal-theme.png)
 
-If your Vim looks like the above image you are using a 256 terminal theme without setting `let base16colorspace=256` in your `~/.vimrc`. Either set `let base16colorspace=256` in your `~/.vimrc` or use a non 256 terminal theme.
+![green line numbers screenshot][13]
+
+If your Vim looks like the above image you are using a 256 terminal
+theme without setting `let base16colorspace=256` in your `~/.vimrc`.
+Either set `let base16colorspace=256` in your `~/.vimrc` or use a non
+256 terminal theme.
 
 ### Blue line numbers
-![blue line numbers screenshot](https://raw.github.com/chriskempson/base16-vim/master/with-base16colorspace-256-without-base16-shell.png)
 
-If your Vim looks like the above image you are setting `let base16colorspace=256` in your `~/.vimrc` but either not running [Base16 Shell](https://github.com/chriskempson/base16-shell) or [Base16 Shell](https://github.com/chriskempson/base16-shell) is not working for your terminal. Either ensure [Base16 Shell](https://github.com/chriskempson/base16-shell) is working by running the `colortest` available in the [Base16 Shell](https://github.com/chriskempson/base16-shell) repository or not setting `let base16colorspace=256` in your `~/.vimrc`.
+![blue line numbers screenshot][14]
+
+If your Vim looks like the above image you are setting `let
+base16colorspace=256` in your `~/.vimrc` but either not running [Base16
+Shell][6] or [Base16 Shell][6] is not working for your terminal. Either
+ensure [Base16 Shell][6] is working by running the `colortest` available
+in the [Base16 Shell][6] repository or not setting `let
+base16colorspace=256` in your `~/.vimrc`.
 
 ## Customization
-If you want to do some local customization, you can add something like this to your `~/.vimrc`:
+
+If you want to do some local customization, you can add something like
+this to your `~/.vimrc`:
 
 ```vim
 function! s:base16_customize() abort
@@ -78,3 +131,23 @@ augroup on_change_colorschema
   autocmd ColorScheme * call s:base16_customize()
 augroup END
 ```
+
+## Contributing
+
+See [`CONTRIBUTING.md`][9], which contains building and contributing
+instructions.
+
+[1]: https://github.com/vim/vim
+[2]: https://github.com/neovim/neovim
+[3]: https://github.com/base16-project/base16-schemes
+[4]: https://github.com/base16-project/base16#official-templates
+[5]: https://github.com/base16-project/base16#unofficial-templates
+[6]: https://github.com/base16-project/base16-shell
+[7]: https://github.com/vim/vim/blob/23c1b2b018c8121ca5fcc247e37966428bf8ca66/runtime/doc/options.txt#L7876
+[8]: https://neovim.io/doc/user/options.html#'termguicolors'
+[9]: CONTRIBUTING.md
+[10]: screenshots/base16-vim-screenshot-classic-dark.png
+[11]: screenshots/base16-vim-screenshot-horizon-dark.png
+[12]: screenshots/base16-vim-screenshot-onedark.png
+[13]: screenshots/without-base16colorspace-256-with-256-terminal-theme.png
+[14]: screenshots/with-base16colorspace-256-without-base16-shell.png
diff --git a/base16-vim.png b/base16-vim.png
deleted file mode 100644
index 631daf2..0000000
--- a/base16-vim.png
+++ /dev/null
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 03eb9ae..df51cd9 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index d9e0fef..747c76c 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "031A16"
-let g:base16_gui00 = "031A16"
-let s:gui01        = "0B342D"
-let g:base16_gui01 = "0B342D"
-let s:gui02        = "184E45"
-let g:base16_gui02 = "184E45"
-let s:gui03        = "2B685E"
-let g:base16_gui03 = "2B685E"
-let s:gui04        = "5F9C92"
-let g:base16_gui04 = "5F9C92"
-let s:gui05        = "81B5AC"
-let g:base16_gui05 = "81B5AC"
-let s:gui06        = "A7CEC8"
-let g:base16_gui06 = "A7CEC8"
-let s:gui07        = "D2E7E4"
-let g:base16_gui07 = "D2E7E4"
-let s:gui08        = "3E9688"
-let g:base16_gui08 = "3E9688"
-let s:gui09        = "3E7996"
-let g:base16_gui09 = "3E7996"
-let s:gui0A        = "3E4C96"
-let g:base16_gui0A = "3E4C96"
-let s:gui0B        = "883E96"
-let g:base16_gui0B = "883E96"
-let s:gui0C        = "963E4C"
-let g:base16_gui0C = "963E4C"
-let s:gui0D        = "96883E"
-let g:base16_gui0D = "96883E"
-let s:gui0E        = "4C963E"
-let g:base16_gui0E = "4C963E"
-let s:gui0F        = "3E965B"
-let g:base16_gui0F = "3E965B"
+let s:gui00        = "031a16"
+let g:base16_gui00 = "031a16"
+let s:gui01        = "0b342d"
+let g:base16_gui01 = "0b342d"
+let s:gui02        = "184e45"
+let g:base16_gui02 = "184e45"
+let s:gui03        = "2b685e"
+let g:base16_gui03 = "2b685e"
+let s:gui04        = "5f9c92"
+let g:base16_gui04 = "5f9c92"
+let s:gui05        = "81b5ac"
+let g:base16_gui05 = "81b5ac"
+let s:gui06        = "a7cec8"
+let g:base16_gui06 = "a7cec8"
+let s:gui07        = "d2e7e4"
+let g:base16_gui07 = "d2e7e4"
+let s:gui08        = "3e9688"
+let g:base16_gui08 = "3e9688"
+let s:gui09        = "3e7996"
+let g:base16_gui09 = "3e7996"
+let s:gui0A        = "3e4c96"
+let g:base16_gui0A = "3e4c96"
+let s:gui0B        = "883e96"
+let g:base16_gui0B = "883e96"
+let s:gui0C        = "963e4c"
+let g:base16_gui0C = "963e4c"
+let s:gui0D        = "96883e"
+let g:base16_gui0D = "96883e"
+let s:gui0E        = "4c963e"
+let g:base16_gui0E = "4c963e"
+let s:gui0F        = "3e965b"
+let g:base16_gui0F = "3e965b"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#031A16"
-  let g:terminal_color_1 =  "#3E9688"
-  let g:terminal_color_2 =  "#883E96"
-  let g:terminal_color_3 =  "#3E4C96"
-  let g:terminal_color_4 =  "#96883E"
-  let g:terminal_color_5 =  "#4C963E"
-  let g:terminal_color_6 =  "#963E4C"
-  let g:terminal_color_7 =  "#81B5AC"
-  let g:terminal_color_8 =  "#2B685E"
-  let g:terminal_color_9 =  "#3E9688"
-  let g:terminal_color_10 = "#883E96"
-  let g:terminal_color_11 = "#3E4C96"
-  let g:terminal_color_12 = "#96883E"
-  let g:terminal_color_13 = "#4C963E"
-  let g:terminal_color_14 = "#963E4C"
-  let g:terminal_color_15 = "#D2E7E4"
+  let g:terminal_color_0 =  "#031a16"
+  let g:terminal_color_1 =  "#3e9688"
+  let g:terminal_color_2 =  "#883e96"
+  let g:terminal_color_3 =  "#3e4c96"
+  let g:terminal_color_4 =  "#96883e"
+  let g:terminal_color_5 =  "#4c963e"
+  let g:terminal_color_6 =  "#963e4c"
+  let g:terminal_color_7 =  "#81b5ac"
+  let g:terminal_color_8 =  "#2b685e"
+  let g:terminal_color_9 =  "#3e9688"
+  let g:terminal_color_10 = "#883e96"
+  let g:terminal_color_11 = "#3e4c96"
+  let g:terminal_color_12 = "#96883e"
+  let g:terminal_color_13 = "#4c963e"
+  let g:terminal_color_14 = "#963e4c"
+  let g:terminal_color_15 = "#d2e7e4"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#031A16",
-        \ "#3E9688",
-        \ "#883E96",
-        \ "#3E4C96",
-        \ "#96883E",
-        \ "#4C963E",
-        \ "#963E4C",
-        \ "#81B5AC",
-        \ "#2B685E",
-        \ "#3E9688",
-        \ "#883E96",
-        \ "#3E4C96",
-        \ "#96883E",
-        \ "#4C963E",
-        \ "#963E4C",
-        \ "#D2E7E4",
+        \ "#031a16",
+        \ "#3e9688",
+        \ "#883e96",
+        \ "#3e4c96",
+        \ "#96883e",
+        \ "#4c963e",
+        \ "#963e4c",
+        \ "#81b5ac",
+        \ "#2b685e",
+        \ "#3e9688",
+        \ "#883e96",
+        \ "#3e4c96",
+        \ "#96883e",
+        \ "#4c963e",
+        \ "#963e4c",
+        \ "#d2e7e4",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-apprentice.vim b/colors/base16-apprentice.vim
index e384686..a27cca4 100644
--- a/colors/base16-apprentice.vim
+++ b/colors/base16-apprentice.vim
@@ -21,32 +21,32 @@ let s:gui01        = "303030"
 let g:base16_gui01 = "303030"
 let s:gui02        = "333333"
 let g:base16_gui02 = "333333"
-let s:gui03        = "6C6C6C"
-let g:base16_gui03 = "6C6C6C"
+let s:gui03        = "6c6c6c"
+let g:base16_gui03 = "6c6c6c"
 let s:gui04        = "787878"
 let g:base16_gui04 = "787878"
-let s:gui05        = "BCBCBC"
-let g:base16_gui05 = "BCBCBC"
-let s:gui06        = "C9C9C9"
-let g:base16_gui06 = "C9C9C9"
-let s:gui07        = "FFFFFF"
-let g:base16_gui07 = "FFFFFF"
-let s:gui08        = "5F8787"
-let g:base16_gui08 = "5F8787"
-let s:gui09        = "FF8700"
-let g:base16_gui09 = "FF8700"
-let s:gui0A        = "5F8787"
-let g:base16_gui0A = "5F8787"
-let s:gui0B        = "87AF87"
-let g:base16_gui0B = "87AF87"
-let s:gui0C        = "5F875F"
-let g:base16_gui0C = "5F875F"
-let s:gui0D        = "FFFFAF"
-let g:base16_gui0D = "FFFFAF"
-let s:gui0E        = "87AFD7"
-let g:base16_gui0E = "87AFD7"
-let s:gui0F        = "5F87AF"
-let g:base16_gui0F = "5F87AF"
+let s:gui05        = "bcbcbc"
+let g:base16_gui05 = "bcbcbc"
+let s:gui06        = "c9c9c9"
+let g:base16_gui06 = "c9c9c9"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "5f8787"
+let g:base16_gui08 = "5f8787"
+let s:gui09        = "ff8700"
+let g:base16_gui09 = "ff8700"
+let s:gui0A        = "5f8787"
+let g:base16_gui0A = "5f8787"
+let s:gui0B        = "87af87"
+let g:base16_gui0B = "87af87"
+let s:gui0C        = "5f875f"
+let g:base16_gui0C = "5f875f"
+let s:gui0D        = "ffffaf"
+let g:base16_gui0D = "ffffaf"
+let s:gui0E        = "87afd7"
+let g:base16_gui0E = "87afd7"
+let s:gui0F        = "5f87af"
+let g:base16_gui0F = "5f87af"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#262626"
-  let g:terminal_color_1 =  "#5F8787"
-  let g:terminal_color_2 =  "#87AF87"
-  let g:terminal_color_3 =  "#5F8787"
-  let g:terminal_color_4 =  "#FFFFAF"
-  let g:terminal_color_5 =  "#87AFD7"
-  let g:terminal_color_6 =  "#5F875F"
-  let g:terminal_color_7 =  "#BCBCBC"
-  let g:terminal_color_8 =  "#6C6C6C"
-  let g:terminal_color_9 =  "#5F8787"
-  let g:terminal_color_10 = "#87AF87"
-  let g:terminal_color_11 = "#5F8787"
-  let g:terminal_color_12 = "#FFFFAF"
-  let g:terminal_color_13 = "#87AFD7"
-  let g:terminal_color_14 = "#5F875F"
-  let g:terminal_color_15 = "#FFFFFF"
+  let g:terminal_color_1 =  "#5f8787"
+  let g:terminal_color_2 =  "#87af87"
+  let g:terminal_color_3 =  "#5f8787"
+  let g:terminal_color_4 =  "#ffffaf"
+  let g:terminal_color_5 =  "#87afd7"
+  let g:terminal_color_6 =  "#5f875f"
+  let g:terminal_color_7 =  "#bcbcbc"
+  let g:terminal_color_8 =  "#6c6c6c"
+  let g:terminal_color_9 =  "#5f8787"
+  let g:terminal_color_10 = "#87af87"
+  let g:terminal_color_11 = "#5f8787"
+  let g:terminal_color_12 = "#ffffaf"
+  let g:terminal_color_13 = "#87afd7"
+  let g:terminal_color_14 = "#5f875f"
+  let g:terminal_color_15 = "#ffffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#262626",
-        \ "#5F8787",
-        \ "#87AF87",
-        \ "#5F8787",
-        \ "#FFFFAF",
-        \ "#87AFD7",
-        \ "#5F875F",
-        \ "#BCBCBC",
-        \ "#6C6C6C",
-        \ "#5F8787",
-        \ "#87AF87",
-        \ "#5F8787",
-        \ "#FFFFAF",
-        \ "#87AFD7",
-        \ "#5F875F",
-        \ "#FFFFFF",
+        \ "#5f8787",
+        \ "#87af87",
+        \ "#5f8787",
+        \ "#ffffaf",
+        \ "#87afd7",
+        \ "#5f875f",
+        \ "#bcbcbc",
+        \ "#6c6c6c",
+        \ "#5f8787",
+        \ "#87af87",
+        \ "#5f8787",
+        \ "#ffffaf",
+        \ "#87afd7",
+        \ "#5f875f",
+        \ "#ffffff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 5e55c6b..85a1f4e 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "1C2023"
-let g:base16_gui00 = "1C2023"
-let s:gui01        = "393F45"
-let g:base16_gui01 = "393F45"
-let s:gui02        = "565E65"
-let g:base16_gui02 = "565E65"
-let s:gui03        = "747C84"
-let g:base16_gui03 = "747C84"
-let s:gui04        = "ADB3BA"
-let g:base16_gui04 = "ADB3BA"
-let s:gui05        = "C7CCD1"
-let g:base16_gui05 = "C7CCD1"
-let s:gui06        = "DFE2E5"
-let g:base16_gui06 = "DFE2E5"
-let s:gui07        = "F3F4F5"
-let g:base16_gui07 = "F3F4F5"
-let s:gui08        = "C7AE95"
-let g:base16_gui08 = "C7AE95"
-let s:gui09        = "C7C795"
-let g:base16_gui09 = "C7C795"
-let s:gui0A        = "AEC795"
-let g:base16_gui0A = "AEC795"
-let s:gui0B        = "95C7AE"
-let g:base16_gui0B = "95C7AE"
-let s:gui0C        = "95AEC7"
-let g:base16_gui0C = "95AEC7"
-let s:gui0D        = "AE95C7"
-let g:base16_gui0D = "AE95C7"
-let s:gui0E        = "C795AE"
-let g:base16_gui0E = "C795AE"
-let s:gui0F        = "C79595"
-let g:base16_gui0F = "C79595"
+let s:gui00        = "1c2023"
+let g:base16_gui00 = "1c2023"
+let s:gui01        = "393f45"
+let g:base16_gui01 = "393f45"
+let s:gui02        = "565e65"
+let g:base16_gui02 = "565e65"
+let s:gui03        = "747c84"
+let g:base16_gui03 = "747c84"
+let s:gui04        = "adb3ba"
+let g:base16_gui04 = "adb3ba"
+let s:gui05        = "c7ccd1"
+let g:base16_gui05 = "c7ccd1"
+let s:gui06        = "dfe2e5"
+let g:base16_gui06 = "dfe2e5"
+let s:gui07        = "f3f4f5"
+let g:base16_gui07 = "f3f4f5"
+let s:gui08        = "c7ae95"
+let g:base16_gui08 = "c7ae95"
+let s:gui09        = "c7c795"
+let g:base16_gui09 = "c7c795"
+let s:gui0A        = "aec795"
+let g:base16_gui0A = "aec795"
+let s:gui0B        = "95c7ae"
+let g:base16_gui0B = "95c7ae"
+let s:gui0C        = "95aec7"
+let g:base16_gui0C = "95aec7"
+let s:gui0D        = "ae95c7"
+let g:base16_gui0D = "ae95c7"
+let s:gui0E        = "c795ae"
+let g:base16_gui0E = "c795ae"
+let s:gui0F        = "c79595"
+let g:base16_gui0F = "c79595"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#1C2023"
-  let g:terminal_color_1 =  "#C7AE95"
-  let g:terminal_color_2 =  "#95C7AE"
-  let g:terminal_color_3 =  "#AEC795"
-  let g:terminal_color_4 =  "#AE95C7"
-  let g:terminal_color_5 =  "#C795AE"
-  let g:terminal_color_6 =  "#95AEC7"
-  let g:terminal_color_7 =  "#C7CCD1"
-  let g:terminal_color_8 =  "#747C84"
-  let g:terminal_color_9 =  "#C7AE95"
-  let g:terminal_color_10 = "#95C7AE"
-  let g:terminal_color_11 = "#AEC795"
-  let g:terminal_color_12 = "#AE95C7"
-  let g:terminal_color_13 = "#C795AE"
-  let g:terminal_color_14 = "#95AEC7"
-  let g:terminal_color_15 = "#F3F4F5"
+  let g:terminal_color_0 =  "#1c2023"
+  let g:terminal_color_1 =  "#c7ae95"
+  let g:terminal_color_2 =  "#95c7ae"
+  let g:terminal_color_3 =  "#aec795"
+  let g:terminal_color_4 =  "#ae95c7"
+  let g:terminal_color_5 =  "#c795ae"
+  let g:terminal_color_6 =  "#95aec7"
+  let g:terminal_color_7 =  "#c7ccd1"
+  let g:terminal_color_8 =  "#747c84"
+  let g:terminal_color_9 =  "#c7ae95"
+  let g:terminal_color_10 = "#95c7ae"
+  let g:terminal_color_11 = "#aec795"
+  let g:terminal_color_12 = "#ae95c7"
+  let g:terminal_color_13 = "#c795ae"
+  let g:terminal_color_14 = "#95aec7"
+  let g:terminal_color_15 = "#f3f4f5"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#1C2023",
-        \ "#C7AE95",
-        \ "#95C7AE",
-        \ "#AEC795",
-        \ "#AE95C7",
-        \ "#C795AE",
-        \ "#95AEC7",
-        \ "#C7CCD1",
-        \ "#747C84",
-        \ "#C7AE95",
-        \ "#95C7AE",
-        \ "#AEC795",
-        \ "#AE95C7",
-        \ "#C795AE",
-        \ "#95AEC7",
-        \ "#F3F4F5",
+        \ "#1c2023",
+        \ "#c7ae95",
+        \ "#95c7ae",
+        \ "#aec795",
+        \ "#ae95c7",
+        \ "#c795ae",
+        \ "#95aec7",
+        \ "#c7ccd1",
+        \ "#747c84",
+        \ "#c7ae95",
+        \ "#95c7ae",
+        \ "#aec795",
+        \ "#ae95c7",
+        \ "#c795ae",
+        \ "#95aec7",
+        \ "#f3f4f5",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim
index bef46bf..3cb798c 100644
--- a/colors/base16-atelier-cave-light.vim
+++ b/colors/base16-atelier-cave-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim
index 6c2da32..9fcc0f7 100644
--- a/colors/base16-atelier-cave.vim
+++ b/colors/base16-atelier-cave.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim
index 3697610..5867c95 100644
--- a/colors/base16-atelier-dune-light.vim
+++ b/colors/base16-atelier-dune-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim
index efff2f5..1b97afb 100644
--- a/colors/base16-atelier-dune.vim
+++ b/colors/base16-atelier-dune.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim
index 7707b89..c46942e 100644
--- a/colors/base16-atelier-estuary-light.vim
+++ b/colors/base16-atelier-estuary-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim
index ddc9e46..6775ef8 100644
--- a/colors/base16-atelier-estuary.vim
+++ b/colors/base16-atelier-estuary.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim
index 41804db..1708316 100644
--- a/colors/base16-atelier-forest-light.vim
+++ b/colors/base16-atelier-forest-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim
index e55a3d8..33d3742 100644
--- a/colors/base16-atelier-forest.vim
+++ b/colors/base16-atelier-forest.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim
index 5da5a2b..8f33a0f 100644
--- a/colors/base16-atelier-heath-light.vim
+++ b/colors/base16-atelier-heath-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim
index d7f6b6c..b81333a 100644
--- a/colors/base16-atelier-heath.vim
+++ b/colors/base16-atelier-heath.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim
index 5b0b343..c15abb1 100644
--- a/colors/base16-atelier-lakeside-light.vim
+++ b/colors/base16-atelier-lakeside-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim
index 672f99c..92183d8 100644
--- a/colors/base16-atelier-lakeside.vim
+++ b/colors/base16-atelier-lakeside.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim
index 9de1500..17e03ed 100644
--- a/colors/base16-atelier-plateau-light.vim
+++ b/colors/base16-atelier-plateau-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim
index f84a16e..cbc0c5a 100644
--- a/colors/base16-atelier-plateau.vim
+++ b/colors/base16-atelier-plateau.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim
index 90a760a..5f0f1c7 100644
--- a/colors/base16-atelier-savanna-light.vim
+++ b/colors/base16-atelier-savanna-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim
index 8d32311..68b113e 100644
--- a/colors/base16-atelier-savanna.vim
+++ b/colors/base16-atelier-savanna.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim
index aebd083..91d34ea 100644
--- a/colors/base16-atelier-seaside-light.vim
+++ b/colors/base16-atelier-seaside-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim
index 9902e80..2b678a8 100644
--- a/colors/base16-atelier-seaside.vim
+++ b/colors/base16-atelier-seaside.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim
index 5f2bb46..e12796c 100644
--- a/colors/base16-atelier-sulphurpool-light.vim
+++ b/colors/base16-atelier-sulphurpool-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim
index 64da5cc..61051ff 100644
--- a/colors/base16-atelier-sulphurpool.vim
+++ b/colors/base16-atelier-sulphurpool.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-atlas.vim b/colors/base16-atlas.vim
index 1c1960c..e1ba64c 100644
--- a/colors/base16-atlas.vim
+++ b/colors/base16-atlas.vim
@@ -19,10 +19,10 @@ let s:gui00        = "002635"
 let g:base16_gui00 = "002635"
 let s:gui01        = "00384d"
 let g:base16_gui01 = "00384d"
-let s:gui02        = "517F8D"
-let g:base16_gui02 = "517F8D"
-let s:gui03        = "6C8B91"
-let g:base16_gui03 = "6C8B91"
+let s:gui02        = "517f8d"
+let g:base16_gui02 = "517f8d"
+let s:gui03        = "6c8b91"
+let g:base16_gui03 = "6c8b91"
 let s:gui04        = "869696"
 let g:base16_gui04 = "869696"
 let s:gui05        = "a1a19a"
@@ -107,7 +107,7 @@ if has("nvim")
   let g:terminal_color_5 =  "#9a70a4"
   let g:terminal_color_6 =  "#14747e"
   let g:terminal_color_7 =  "#a1a19a"
-  let g:terminal_color_8 =  "#6C8B91"
+  let g:terminal_color_8 =  "#6c8b91"
   let g:terminal_color_9 =  "#ff5a67"
   let g:terminal_color_10 = "#7fc06e"
   let g:terminal_color_11 = "#ffcc1b"
@@ -131,7 +131,7 @@ elseif has("terminal")
         \ "#9a70a4",
         \ "#14747e",
         \ "#a1a19a",
-        \ "#6C8B91",
+        \ "#6c8b91",
         \ "#ff5a67",
         \ "#7fc06e",
         \ "#ffcc1b",
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-ayu-dark.vim b/colors/base16-ayu-dark.vim
new file mode 100644
index 0000000..d581060
--- /dev/null
+++ b/colors/base16-ayu-dark.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Ayu Dark scheme by Khue Nguyen &lt;Z5483Y@gmail.com&gt;
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ayu-dark.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "0f1419"
+let g:base16_gui00 = "0f1419"
+let s:gui01        = "131721"
+let g:base16_gui01 = "131721"
+let s:gui02        = "272d38"
+let g:base16_gui02 = "272d38"
+let s:gui03        = "3e4b59"
+let g:base16_gui03 = "3e4b59"
+let s:gui04        = "bfbdb6"
+let g:base16_gui04 = "bfbdb6"
+let s:gui05        = "e6e1cf"
+let g:base16_gui05 = "e6e1cf"
+let s:gui06        = "e6e1cf"
+let g:base16_gui06 = "e6e1cf"
+let s:gui07        = "f3f4f5"
+let g:base16_gui07 = "f3f4f5"
+let s:gui08        = "f07178"
+let g:base16_gui08 = "f07178"
+let s:gui09        = "ff8f40"
+let g:base16_gui09 = "ff8f40"
+let s:gui0A        = "ffb454"
+let g:base16_gui0A = "ffb454"
+let s:gui0B        = "b8cc52"
+let g:base16_gui0B = "b8cc52"
+let s:gui0C        = "95e6cb"
+let g:base16_gui0C = "95e6cb"
+let s:gui0D        = "59c2ff"
+let g:base16_gui0D = "59c2ff"
+let s:gui0E        = "d2a6ff"
+let g:base16_gui0E = "d2a6ff"
+let s:gui0F        = "e6b673"
+let g:base16_gui0F = "e6b673"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#0f1419"
+  let g:terminal_color_1 =  "#f07178"
+  let g:terminal_color_2 =  "#b8cc52"
+  let g:terminal_color_3 =  "#ffb454"
+  let g:terminal_color_4 =  "#59c2ff"
+  let g:terminal_color_5 =  "#d2a6ff"
+  let g:terminal_color_6 =  "#95e6cb"
+  let g:terminal_color_7 =  "#e6e1cf"
+  let g:terminal_color_8 =  "#3e4b59"
+  let g:terminal_color_9 =  "#f07178"
+  let g:terminal_color_10 = "#b8cc52"
+  let g:terminal_color_11 = "#ffb454"
+  let g:terminal_color_12 = "#59c2ff"
+  let g:terminal_color_13 = "#d2a6ff"
+  let g:terminal_color_14 = "#95e6cb"
+  let g:terminal_color_15 = "#f3f4f5"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#0f1419",
+        \ "#f07178",
+        \ "#b8cc52",
+        \ "#ffb454",
+        \ "#59c2ff",
+        \ "#d2a6ff",
+        \ "#95e6cb",
+        \ "#e6e1cf",
+        \ "#3e4b59",
+        \ "#f07178",
+        \ "#b8cc52",
+        \ "#ffb454",
+        \ "#59c2ff",
+        \ "#d2a6ff",
+        \ "#95e6cb",
+        \ "#f3f4f5",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-ayu-dark"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-ayu-light.vim b/colors/base16-ayu-light.vim
new file mode 100644
index 0000000..6d4134e
--- /dev/null
+++ b/colors/base16-ayu-light.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Ayu Light scheme by Khue Nguyen &lt;Z5483Y@gmail.com&gt;
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ayu-light.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "fafafa"
+let g:base16_gui00 = "fafafa"
+let s:gui01        = "f3f4f5"
+let g:base16_gui01 = "f3f4f5"
+let s:gui02        = "f8f9fa"
+let g:base16_gui02 = "f8f9fa"
+let s:gui03        = "abb0b6"
+let g:base16_gui03 = "abb0b6"
+let s:gui04        = "828c99"
+let g:base16_gui04 = "828c99"
+let s:gui05        = "5c6773"
+let g:base16_gui05 = "5c6773"
+let s:gui06        = "242936"
+let g:base16_gui06 = "242936"
+let s:gui07        = "1a1f29"
+let g:base16_gui07 = "1a1f29"
+let s:gui08        = "f07178"
+let g:base16_gui08 = "f07178"
+let s:gui09        = "fa8d3e"
+let g:base16_gui09 = "fa8d3e"
+let s:gui0A        = "f2ae49"
+let g:base16_gui0A = "f2ae49"
+let s:gui0B        = "86b300"
+let g:base16_gui0B = "86b300"
+let s:gui0C        = "4cbf99"
+let g:base16_gui0C = "4cbf99"
+let s:gui0D        = "36a3d9"
+let g:base16_gui0D = "36a3d9"
+let s:gui0E        = "a37acc"
+let g:base16_gui0E = "a37acc"
+let s:gui0F        = "e6ba7e"
+let g:base16_gui0F = "e6ba7e"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#fafafa"
+  let g:terminal_color_1 =  "#f07178"
+  let g:terminal_color_2 =  "#86b300"
+  let g:terminal_color_3 =  "#f2ae49"
+  let g:terminal_color_4 =  "#36a3d9"
+  let g:terminal_color_5 =  "#a37acc"
+  let g:terminal_color_6 =  "#4cbf99"
+  let g:terminal_color_7 =  "#5c6773"
+  let g:terminal_color_8 =  "#abb0b6"
+  let g:terminal_color_9 =  "#f07178"
+  let g:terminal_color_10 = "#86b300"
+  let g:terminal_color_11 = "#f2ae49"
+  let g:terminal_color_12 = "#36a3d9"
+  let g:terminal_color_13 = "#a37acc"
+  let g:terminal_color_14 = "#4cbf99"
+  let g:terminal_color_15 = "#1a1f29"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#fafafa",
+        \ "#f07178",
+        \ "#86b300",
+        \ "#f2ae49",
+        \ "#36a3d9",
+        \ "#a37acc",
+        \ "#4cbf99",
+        \ "#5c6773",
+        \ "#abb0b6",
+        \ "#f07178",
+        \ "#86b300",
+        \ "#f2ae49",
+        \ "#36a3d9",
+        \ "#a37acc",
+        \ "#4cbf99",
+        \ "#1a1f29",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-ayu-light"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-ayu-mirage.vim b/colors/base16-ayu-mirage.vim
new file mode 100644
index 0000000..3df0c2d
--- /dev/null
+++ b/colors/base16-ayu-mirage.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Ayu Mirage scheme by Khue Nguyen &lt;Z5483Y@gmail.com&gt;
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-ayu-mirage.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "171b24"
+let g:base16_gui00 = "171b24"
+let s:gui01        = "1f2430"
+let g:base16_gui01 = "1f2430"
+let s:gui02        = "242936"
+let g:base16_gui02 = "242936"
+let s:gui03        = "707a8c"
+let g:base16_gui03 = "707a8c"
+let s:gui04        = "8a9199"
+let g:base16_gui04 = "8a9199"
+let s:gui05        = "cccac2"
+let g:base16_gui05 = "cccac2"
+let s:gui06        = "d9d7ce"
+let g:base16_gui06 = "d9d7ce"
+let s:gui07        = "f3f4f5"
+let g:base16_gui07 = "f3f4f5"
+let s:gui08        = "f28779"
+let g:base16_gui08 = "f28779"
+let s:gui09        = "ffad66"
+let g:base16_gui09 = "ffad66"
+let s:gui0A        = "ffd173"
+let g:base16_gui0A = "ffd173"
+let s:gui0B        = "d5ff80"
+let g:base16_gui0B = "d5ff80"
+let s:gui0C        = "95e6cb"
+let g:base16_gui0C = "95e6cb"
+let s:gui0D        = "5ccfe6"
+let g:base16_gui0D = "5ccfe6"
+let s:gui0E        = "d4bfff"
+let g:base16_gui0E = "d4bfff"
+let s:gui0F        = "f29e74"
+let g:base16_gui0F = "f29e74"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#171b24"
+  let g:terminal_color_1 =  "#f28779"
+  let g:terminal_color_2 =  "#d5ff80"
+  let g:terminal_color_3 =  "#ffd173"
+  let g:terminal_color_4 =  "#5ccfe6"
+  let g:terminal_color_5 =  "#d4bfff"
+  let g:terminal_color_6 =  "#95e6cb"
+  let g:terminal_color_7 =  "#cccac2"
+  let g:terminal_color_8 =  "#707a8c"
+  let g:terminal_color_9 =  "#f28779"
+  let g:terminal_color_10 = "#d5ff80"
+  let g:terminal_color_11 = "#ffd173"
+  let g:terminal_color_12 = "#5ccfe6"
+  let g:terminal_color_13 = "#d4bfff"
+  let g:terminal_color_14 = "#95e6cb"
+  let g:terminal_color_15 = "#f3f4f5"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#171b24",
+        \ "#f28779",
+        \ "#d5ff80",
+        \ "#ffd173",
+        \ "#5ccfe6",
+        \ "#d4bfff",
+        \ "#95e6cb",
+        \ "#cccac2",
+        \ "#707a8c",
+        \ "#f28779",
+        \ "#d5ff80",
+        \ "#ffd173",
+        \ "#5ccfe6",
+        \ "#d4bfff",
+        \ "#95e6cb",
+        \ "#f3f4f5",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-ayu-mirage"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index d28c9a0..d772059 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-bathory.vim b/colors/base16-black-metal-bathory.vim
index 7a4b181..a564d32 100644
--- a/colors/base16-black-metal-bathory.vim
+++ b/colors/base16-black-metal-bathory.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-burzum.vim b/colors/base16-black-metal-burzum.vim
index 7e829e0..3c8f133 100644
--- a/colors/base16-black-metal-burzum.vim
+++ b/colors/base16-black-metal-burzum.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-dark-funeral.vim b/colors/base16-black-metal-dark-funeral.vim
index a666e58..eb7bb02 100644
--- a/colors/base16-black-metal-dark-funeral.vim
+++ b/colors/base16-black-metal-dark-funeral.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-gorgoroth.vim b/colors/base16-black-metal-gorgoroth.vim
index d5acfe8..155994b 100644
--- a/colors/base16-black-metal-gorgoroth.vim
+++ b/colors/base16-black-metal-gorgoroth.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-immortal.vim b/colors/base16-black-metal-immortal.vim
index 6ae980b..b256c97 100644
--- a/colors/base16-black-metal-immortal.vim
+++ b/colors/base16-black-metal-immortal.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-khold.vim b/colors/base16-black-metal-khold.vim
index 1f12e03..2a896fe 100644
--- a/colors/base16-black-metal-khold.vim
+++ b/colors/base16-black-metal-khold.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-marduk.vim b/colors/base16-black-metal-marduk.vim
index 957f2e0..598042f 100644
--- a/colors/base16-black-metal-marduk.vim
+++ b/colors/base16-black-metal-marduk.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-mayhem.vim b/colors/base16-black-metal-mayhem.vim
index a7196f8..103db9b 100644
--- a/colors/base16-black-metal-mayhem.vim
+++ b/colors/base16-black-metal-mayhem.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-nile.vim b/colors/base16-black-metal-nile.vim
index d9118ee..ce8dca3 100644
--- a/colors/base16-black-metal-nile.vim
+++ b/colors/base16-black-metal-nile.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal-venom.vim b/colors/base16-black-metal-venom.vim
index 67fdcc6..b063c54 100644
--- a/colors/base16-black-metal-venom.vim
+++ b/colors/base16-black-metal-venom.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-black-metal.vim b/colors/base16-black-metal.vim
index 46eff4f..c36b5fb 100644
--- a/colors/base16-black-metal.vim
+++ b/colors/base16-black-metal.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-blueforest.vim b/colors/base16-blueforest.vim
new file mode 100644
index 0000000..156b0d7
--- /dev/null
+++ b/colors/base16-blueforest.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Blue Forest scheme by alonsodomin (https://github.com/alonsodomin)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-blueforest.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "141f2e"
+let g:base16_gui00 = "141f2e"
+let s:gui01        = "1e5c1e"
+let g:base16_gui01 = "1e5c1e"
+let s:gui02        = "273e5c"
+let g:base16_gui02 = "273e5c"
+let s:gui03        = "a0ffa0"
+let g:base16_gui03 = "a0ffa0"
+let s:gui04        = "1e5c1e"
+let g:base16_gui04 = "1e5c1e"
+let s:gui05        = "ffcc33"
+let g:base16_gui05 = "ffcc33"
+let s:gui06        = "91ccff"
+let g:base16_gui06 = "91ccff"
+let s:gui07        = "375780"
+let g:base16_gui07 = "375780"
+let s:gui08        = "fffab1"
+let g:base16_gui08 = "fffab1"
+let s:gui09        = "ff8080"
+let g:base16_gui09 = "ff8080"
+let s:gui0A        = "91ccff"
+let g:base16_gui0A = "91ccff"
+let s:gui0B        = "80ff80"
+let g:base16_gui0B = "80ff80"
+let s:gui0C        = "80ff80"
+let g:base16_gui0C = "80ff80"
+let s:gui0D        = "a2cff5"
+let g:base16_gui0D = "a2cff5"
+let s:gui0E        = "0099ff"
+let g:base16_gui0E = "0099ff"
+let s:gui0F        = "e7e7e7"
+let g:base16_gui0F = "e7e7e7"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#141f2e"
+  let g:terminal_color_1 =  "#fffab1"
+  let g:terminal_color_2 =  "#80ff80"
+  let g:terminal_color_3 =  "#91ccff"
+  let g:terminal_color_4 =  "#a2cff5"
+  let g:terminal_color_5 =  "#0099ff"
+  let g:terminal_color_6 =  "#80ff80"
+  let g:terminal_color_7 =  "#ffcc33"
+  let g:terminal_color_8 =  "#a0ffa0"
+  let g:terminal_color_9 =  "#fffab1"
+  let g:terminal_color_10 = "#80ff80"
+  let g:terminal_color_11 = "#91ccff"
+  let g:terminal_color_12 = "#a2cff5"
+  let g:terminal_color_13 = "#0099ff"
+  let g:terminal_color_14 = "#80ff80"
+  let g:terminal_color_15 = "#375780"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#141f2e",
+        \ "#fffab1",
+        \ "#80ff80",
+        \ "#91ccff",
+        \ "#a2cff5",
+        \ "#0099ff",
+        \ "#80ff80",
+        \ "#ffcc33",
+        \ "#a0ffa0",
+        \ "#fffab1",
+        \ "#80ff80",
+        \ "#91ccff",
+        \ "#a2cff5",
+        \ "#0099ff",
+        \ "#80ff80",
+        \ "#375780",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-blueforest"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-blueish.vim b/colors/base16-blueish.vim
new file mode 100644
index 0000000..6eb2181
--- /dev/null
+++ b/colors/base16-blueish.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" better-contrast scheme by Ben Mayoras
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-blueish.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "182430"
+let g:base16_gui00 = "182430"
+let s:gui01        = "243c54"
+let g:base16_gui01 = "243c54"
+let s:gui02        = "46290a"
+let g:base16_gui02 = "46290a"
+let s:gui03        = "616d78"
+let g:base16_gui03 = "616d78"
+let s:gui04        = "74afe7"
+let g:base16_gui04 = "74afe7"
+let s:gui05        = "c8e1f8"
+let g:base16_gui05 = "c8e1f8"
+let s:gui06        = "ddeaf6"
+let g:base16_gui06 = "ddeaf6"
+let s:gui07        = "8f98a0"
+let g:base16_gui07 = "8f98a0"
+let s:gui08        = "4ce587"
+let g:base16_gui08 = "4ce587"
+let s:gui09        = "f6a85c"
+let g:base16_gui09 = "f6a85c"
+let s:gui0A        = "82aaff"
+let g:base16_gui0A = "82aaff"
+let s:gui0B        = "c3e88d"
+let g:base16_gui0B = "c3e88d"
+let s:gui0C        = "5fd1ff"
+let g:base16_gui0C = "5fd1ff"
+let s:gui0D        = "82aaff"
+let g:base16_gui0D = "82aaff"
+let s:gui0E        = "ff84dd"
+let g:base16_gui0E = "ff84dd"
+let s:gui0F        = "bbd2e8"
+let g:base16_gui0F = "bbd2e8"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#182430"
+  let g:terminal_color_1 =  "#4ce587"
+  let g:terminal_color_2 =  "#c3e88d"
+  let g:terminal_color_3 =  "#82aaff"
+  let g:terminal_color_4 =  "#82aaff"
+  let g:terminal_color_5 =  "#ff84dd"
+  let g:terminal_color_6 =  "#5fd1ff"
+  let g:terminal_color_7 =  "#c8e1f8"
+  let g:terminal_color_8 =  "#616d78"
+  let g:terminal_color_9 =  "#4ce587"
+  let g:terminal_color_10 = "#c3e88d"
+  let g:terminal_color_11 = "#82aaff"
+  let g:terminal_color_12 = "#82aaff"
+  let g:terminal_color_13 = "#ff84dd"
+  let g:terminal_color_14 = "#5fd1ff"
+  let g:terminal_color_15 = "#8f98a0"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#182430",
+        \ "#4ce587",
+        \ "#c3e88d",
+        \ "#82aaff",
+        \ "#82aaff",
+        \ "#ff84dd",
+        \ "#5fd1ff",
+        \ "#c8e1f8",
+        \ "#616d78",
+        \ "#4ce587",
+        \ "#c3e88d",
+        \ "#82aaff",
+        \ "#82aaff",
+        \ "#ff84dd",
+        \ "#5fd1ff",
+        \ "#8f98a0",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-blueish"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index fd1d999..3ca74cd 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index d8f5f97..efa96fa 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-brogrammer.vim b/colors/base16-brogrammer.vim
index 9783bb1..d7f2421 100644
--- a/colors/base16-brogrammer.vim
+++ b/colors/base16-brogrammer.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim
index 4985f00..760ada9 100644
--- a/colors/base16-brushtrees-dark.vim
+++ b/colors/base16-brushtrees-dark.vim
@@ -17,20 +17,20 @@ endif
 " GUI color definitions
 let s:gui00        = "485867"
 let g:base16_gui00 = "485867"
-let s:gui01        = "5A6D7A"
-let g:base16_gui01 = "5A6D7A"
-let s:gui02        = "6D828E"
-let g:base16_gui02 = "6D828E"
-let s:gui03        = "8299A1"
-let g:base16_gui03 = "8299A1"
-let s:gui04        = "98AFB5"
-let g:base16_gui04 = "98AFB5"
-let s:gui05        = "B0C5C8"
-let g:base16_gui05 = "B0C5C8"
-let s:gui06        = "C9DBDC"
-let g:base16_gui06 = "C9DBDC"
-let s:gui07        = "E3EFEF"
-let g:base16_gui07 = "E3EFEF"
+let s:gui01        = "5a6d7a"
+let g:base16_gui01 = "5a6d7a"
+let s:gui02        = "6d828e"
+let g:base16_gui02 = "6d828e"
+let s:gui03        = "8299a1"
+let g:base16_gui03 = "8299a1"
+let s:gui04        = "98afb5"
+let g:base16_gui04 = "98afb5"
+let s:gui05        = "b0c5c8"
+let g:base16_gui05 = "b0c5c8"
+let s:gui06        = "c9dbdc"
+let g:base16_gui06 = "c9dbdc"
+let s:gui07        = "e3efef"
+let g:base16_gui07 = "e3efef"
 let s:gui08        = "b38686"
 let g:base16_gui08 = "b38686"
 let s:gui09        = "d8bba2"
@@ -106,15 +106,15 @@ if has("nvim")
   let g:terminal_color_4 =  "#868cb3"
   let g:terminal_color_5 =  "#b386b2"
   let g:terminal_color_6 =  "#86b3b3"
-  let g:terminal_color_7 =  "#B0C5C8"
-  let g:terminal_color_8 =  "#8299A1"
+  let g:terminal_color_7 =  "#b0c5c8"
+  let g:terminal_color_8 =  "#8299a1"
   let g:terminal_color_9 =  "#b38686"
   let g:terminal_color_10 = "#87b386"
   let g:terminal_color_11 = "#aab386"
   let g:terminal_color_12 = "#868cb3"
   let g:terminal_color_13 = "#b386b2"
   let g:terminal_color_14 = "#86b3b3"
-  let g:terminal_color_15 = "#E3EFEF"
+  let g:terminal_color_15 = "#e3efef"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -130,15 +130,15 @@ elseif has("terminal")
         \ "#868cb3",
         \ "#b386b2",
         \ "#86b3b3",
-        \ "#B0C5C8",
-        \ "#8299A1",
+        \ "#b0c5c8",
+        \ "#8299a1",
         \ "#b38686",
         \ "#87b386",
         \ "#aab386",
         \ "#868cb3",
         \ "#b386b2",
         \ "#86b3b3",
-        \ "#E3EFEF",
+        \ "#e3efef",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim
index a624f9e..7ec08fe 100644
--- a/colors/base16-brushtrees.vim
+++ b/colors/base16-brushtrees.vim
@@ -15,20 +15,20 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "E3EFEF"
-let g:base16_gui00 = "E3EFEF"
-let s:gui01        = "C9DBDC"
-let g:base16_gui01 = "C9DBDC"
-let s:gui02        = "B0C5C8"
-let g:base16_gui02 = "B0C5C8"
-let s:gui03        = "98AFB5"
-let g:base16_gui03 = "98AFB5"
-let s:gui04        = "8299A1"
-let g:base16_gui04 = "8299A1"
-let s:gui05        = "6D828E"
-let g:base16_gui05 = "6D828E"
-let s:gui06        = "5A6D7A"
-let g:base16_gui06 = "5A6D7A"
+let s:gui00        = "e3efef"
+let g:base16_gui00 = "e3efef"
+let s:gui01        = "c9dbdc"
+let g:base16_gui01 = "c9dbdc"
+let s:gui02        = "b0c5c8"
+let g:base16_gui02 = "b0c5c8"
+let s:gui03        = "98afb5"
+let g:base16_gui03 = "98afb5"
+let s:gui04        = "8299a1"
+let g:base16_gui04 = "8299a1"
+let s:gui05        = "6d828e"
+let g:base16_gui05 = "6d828e"
+let s:gui06        = "5a6d7a"
+let g:base16_gui06 = "5a6d7a"
 let s:gui07        = "485867"
 let g:base16_gui07 = "485867"
 let s:gui08        = "b38686"
@@ -99,15 +99,15 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#E3EFEF"
+  let g:terminal_color_0 =  "#e3efef"
   let g:terminal_color_1 =  "#b38686"
   let g:terminal_color_2 =  "#87b386"
   let g:terminal_color_3 =  "#aab386"
   let g:terminal_color_4 =  "#868cb3"
   let g:terminal_color_5 =  "#b386b2"
   let g:terminal_color_6 =  "#86b3b3"
-  let g:terminal_color_7 =  "#6D828E"
-  let g:terminal_color_8 =  "#98AFB5"
+  let g:terminal_color_7 =  "#6d828e"
+  let g:terminal_color_8 =  "#98afb5"
   let g:terminal_color_9 =  "#b38686"
   let g:terminal_color_10 = "#87b386"
   let g:terminal_color_11 = "#aab386"
@@ -123,15 +123,15 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#E3EFEF",
+        \ "#e3efef",
         \ "#b38686",
         \ "#87b386",
         \ "#aab386",
         \ "#868cb3",
         \ "#b386b2",
         \ "#86b3b3",
-        \ "#6D828E",
-        \ "#98AFB5",
+        \ "#6d828e",
+        \ "#98afb5",
         \ "#b38686",
         \ "#87b386",
         \ "#aab386",
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-catppuccin.vim b/colors/base16-catppuccin.vim
new file mode 100644
index 0000000..952e4d0
--- /dev/null
+++ b/colors/base16-catppuccin.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Catppuccin scheme by Pocco81 (https://github.com/pocco81)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-catppuccin.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "1e1e28"
+let g:base16_gui00 = "1e1e28"
+let s:gui01        = "1a1826"
+let g:base16_gui01 = "1a1826"
+let s:gui02        = "302d41"
+let g:base16_gui02 = "302d41"
+let s:gui03        = "575268"
+let g:base16_gui03 = "575268"
+let s:gui04        = "6e6c7c"
+let g:base16_gui04 = "6e6c7c"
+let s:gui05        = "d7dae0"
+let g:base16_gui05 = "d7dae0"
+let s:gui06        = "f5e0dc"
+let g:base16_gui06 = "f5e0dc"
+let s:gui07        = "c9cbff"
+let g:base16_gui07 = "c9cbff"
+let s:gui08        = "f28fad"
+let g:base16_gui08 = "f28fad"
+let s:gui09        = "f8bd96"
+let g:base16_gui09 = "f8bd96"
+let s:gui0A        = "fae3b0"
+let g:base16_gui0A = "fae3b0"
+let s:gui0B        = "abe9b3"
+let g:base16_gui0B = "abe9b3"
+let s:gui0C        = "b5e8e0"
+let g:base16_gui0C = "b5e8e0"
+let s:gui0D        = "96cdfb"
+let g:base16_gui0D = "96cdfb"
+let s:gui0E        = "ddb6f2"
+let g:base16_gui0E = "ddb6f2"
+let s:gui0F        = "f2cdcd"
+let g:base16_gui0F = "f2cdcd"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1e1e28"
+  let g:terminal_color_1 =  "#f28fad"
+  let g:terminal_color_2 =  "#abe9b3"
+  let g:terminal_color_3 =  "#fae3b0"
+  let g:terminal_color_4 =  "#96cdfb"
+  let g:terminal_color_5 =  "#ddb6f2"
+  let g:terminal_color_6 =  "#b5e8e0"
+  let g:terminal_color_7 =  "#d7dae0"
+  let g:terminal_color_8 =  "#575268"
+  let g:terminal_color_9 =  "#f28fad"
+  let g:terminal_color_10 = "#abe9b3"
+  let g:terminal_color_11 = "#fae3b0"
+  let g:terminal_color_12 = "#96cdfb"
+  let g:terminal_color_13 = "#ddb6f2"
+  let g:terminal_color_14 = "#b5e8e0"
+  let g:terminal_color_15 = "#c9cbff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#1e1e28",
+        \ "#f28fad",
+        \ "#abe9b3",
+        \ "#fae3b0",
+        \ "#96cdfb",
+        \ "#ddb6f2",
+        \ "#b5e8e0",
+        \ "#d7dae0",
+        \ "#575268",
+        \ "#f28fad",
+        \ "#abe9b3",
+        \ "#fae3b0",
+        \ "#96cdfb",
+        \ "#ddb6f2",
+        \ "#b5e8e0",
+        \ "#c9cbff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-catppuccin"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index a268874..1ae206a 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim
index fd3a838..1cd61cd 100644
--- a/colors/base16-circus.vim
+++ b/colors/base16-circus.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim
index e548746..c16a861 100644
--- a/colors/base16-classic-dark.vim
+++ b/colors/base16-classic-dark.vim
@@ -23,30 +23,30 @@ let s:gui02        = "303030"
 let g:base16_gui02 = "303030"
 let s:gui03        = "505050"
 let g:base16_gui03 = "505050"
-let s:gui04        = "B0B0B0"
-let g:base16_gui04 = "B0B0B0"
-let s:gui05        = "D0D0D0"
-let g:base16_gui05 = "D0D0D0"
-let s:gui06        = "E0E0E0"
-let g:base16_gui06 = "E0E0E0"
-let s:gui07        = "F5F5F5"
-let g:base16_gui07 = "F5F5F5"
-let s:gui08        = "AC4142"
-let g:base16_gui08 = "AC4142"
-let s:gui09        = "D28445"
-let g:base16_gui09 = "D28445"
-let s:gui0A        = "F4BF75"
-let g:base16_gui0A = "F4BF75"
-let s:gui0B        = "90A959"
-let g:base16_gui0B = "90A959"
-let s:gui0C        = "75B5AA"
-let g:base16_gui0C = "75B5AA"
-let s:gui0D        = "6A9FB5"
-let g:base16_gui0D = "6A9FB5"
-let s:gui0E        = "AA759F"
-let g:base16_gui0E = "AA759F"
-let s:gui0F        = "8F5536"
-let g:base16_gui0F = "8F5536"
+let s:gui04        = "b0b0b0"
+let g:base16_gui04 = "b0b0b0"
+let s:gui05        = "d0d0d0"
+let g:base16_gui05 = "d0d0d0"
+let s:gui06        = "e0e0e0"
+let g:base16_gui06 = "e0e0e0"
+let s:gui07        = "f5f5f5"
+let g:base16_gui07 = "f5f5f5"
+let s:gui08        = "ac4142"
+let g:base16_gui08 = "ac4142"
+let s:gui09        = "d28445"
+let g:base16_gui09 = "d28445"
+let s:gui0A        = "f4bf75"
+let g:base16_gui0A = "f4bf75"
+let s:gui0B        = "90a959"
+let g:base16_gui0B = "90a959"
+let s:gui0C        = "75b5aa"
+let g:base16_gui0C = "75b5aa"
+let s:gui0D        = "6a9fb5"
+let g:base16_gui0D = "6a9fb5"
+let s:gui0E        = "aa759f"
+let g:base16_gui0E = "aa759f"
+let s:gui0F        = "8f5536"
+let g:base16_gui0F = "8f5536"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#151515"
-  let g:terminal_color_1 =  "#AC4142"
-  let g:terminal_color_2 =  "#90A959"
-  let g:terminal_color_3 =  "#F4BF75"
-  let g:terminal_color_4 =  "#6A9FB5"
-  let g:terminal_color_5 =  "#AA759F"
-  let g:terminal_color_6 =  "#75B5AA"
-  let g:terminal_color_7 =  "#D0D0D0"
+  let g:terminal_color_1 =  "#ac4142"
+  let g:terminal_color_2 =  "#90a959"
+  let g:terminal_color_3 =  "#f4bf75"
+  let g:terminal_color_4 =  "#6a9fb5"
+  let g:terminal_color_5 =  "#aa759f"
+  let g:terminal_color_6 =  "#75b5aa"
+  let g:terminal_color_7 =  "#d0d0d0"
   let g:terminal_color_8 =  "#505050"
-  let g:terminal_color_9 =  "#AC4142"
-  let g:terminal_color_10 = "#90A959"
-  let g:terminal_color_11 = "#F4BF75"
-  let g:terminal_color_12 = "#6A9FB5"
-  let g:terminal_color_13 = "#AA759F"
-  let g:terminal_color_14 = "#75B5AA"
-  let g:terminal_color_15 = "#F5F5F5"
+  let g:terminal_color_9 =  "#ac4142"
+  let g:terminal_color_10 = "#90a959"
+  let g:terminal_color_11 = "#f4bf75"
+  let g:terminal_color_12 = "#6a9fb5"
+  let g:terminal_color_13 = "#aa759f"
+  let g:terminal_color_14 = "#75b5aa"
+  let g:terminal_color_15 = "#f5f5f5"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#151515",
-        \ "#AC4142",
-        \ "#90A959",
-        \ "#F4BF75",
-        \ "#6A9FB5",
-        \ "#AA759F",
-        \ "#75B5AA",
-        \ "#D0D0D0",
+        \ "#ac4142",
+        \ "#90a959",
+        \ "#f4bf75",
+        \ "#6a9fb5",
+        \ "#aa759f",
+        \ "#75b5aa",
+        \ "#d0d0d0",
         \ "#505050",
-        \ "#AC4142",
-        \ "#90A959",
-        \ "#F4BF75",
-        \ "#6A9FB5",
-        \ "#AA759F",
-        \ "#75B5AA",
-        \ "#F5F5F5",
+        \ "#ac4142",
+        \ "#90a959",
+        \ "#f4bf75",
+        \ "#6a9fb5",
+        \ "#aa759f",
+        \ "#75b5aa",
+        \ "#f5f5f5",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim
index c565e80..e605743 100644
--- a/colors/base16-classic-light.vim
+++ b/colors/base16-classic-light.vim
@@ -15,14 +15,14 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "F5F5F5"
-let g:base16_gui00 = "F5F5F5"
-let s:gui01        = "E0E0E0"
-let g:base16_gui01 = "E0E0E0"
-let s:gui02        = "D0D0D0"
-let g:base16_gui02 = "D0D0D0"
-let s:gui03        = "B0B0B0"
-let g:base16_gui03 = "B0B0B0"
+let s:gui00        = "f5f5f5"
+let g:base16_gui00 = "f5f5f5"
+let s:gui01        = "e0e0e0"
+let g:base16_gui01 = "e0e0e0"
+let s:gui02        = "d0d0d0"
+let g:base16_gui02 = "d0d0d0"
+let s:gui03        = "b0b0b0"
+let g:base16_gui03 = "b0b0b0"
 let s:gui04        = "505050"
 let g:base16_gui04 = "505050"
 let s:gui05        = "303030"
@@ -31,22 +31,22 @@ let s:gui06        = "202020"
 let g:base16_gui06 = "202020"
 let s:gui07        = "151515"
 let g:base16_gui07 = "151515"
-let s:gui08        = "AC4142"
-let g:base16_gui08 = "AC4142"
-let s:gui09        = "D28445"
-let g:base16_gui09 = "D28445"
-let s:gui0A        = "F4BF75"
-let g:base16_gui0A = "F4BF75"
-let s:gui0B        = "90A959"
-let g:base16_gui0B = "90A959"
-let s:gui0C        = "75B5AA"
-let g:base16_gui0C = "75B5AA"
-let s:gui0D        = "6A9FB5"
-let g:base16_gui0D = "6A9FB5"
-let s:gui0E        = "AA759F"
-let g:base16_gui0E = "AA759F"
-let s:gui0F        = "8F5536"
-let g:base16_gui0F = "8F5536"
+let s:gui08        = "ac4142"
+let g:base16_gui08 = "ac4142"
+let s:gui09        = "d28445"
+let g:base16_gui09 = "d28445"
+let s:gui0A        = "f4bf75"
+let g:base16_gui0A = "f4bf75"
+let s:gui0B        = "90a959"
+let g:base16_gui0B = "90a959"
+let s:gui0C        = "75b5aa"
+let g:base16_gui0C = "75b5aa"
+let s:gui0D        = "6a9fb5"
+let g:base16_gui0D = "6a9fb5"
+let s:gui0E        = "aa759f"
+let g:base16_gui0E = "aa759f"
+let s:gui0F        = "8f5536"
+let g:base16_gui0F = "8f5536"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,21 +99,21 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#F5F5F5"
-  let g:terminal_color_1 =  "#AC4142"
-  let g:terminal_color_2 =  "#90A959"
-  let g:terminal_color_3 =  "#F4BF75"
-  let g:terminal_color_4 =  "#6A9FB5"
-  let g:terminal_color_5 =  "#AA759F"
-  let g:terminal_color_6 =  "#75B5AA"
+  let g:terminal_color_0 =  "#f5f5f5"
+  let g:terminal_color_1 =  "#ac4142"
+  let g:terminal_color_2 =  "#90a959"
+  let g:terminal_color_3 =  "#f4bf75"
+  let g:terminal_color_4 =  "#6a9fb5"
+  let g:terminal_color_5 =  "#aa759f"
+  let g:terminal_color_6 =  "#75b5aa"
   let g:terminal_color_7 =  "#303030"
-  let g:terminal_color_8 =  "#B0B0B0"
-  let g:terminal_color_9 =  "#AC4142"
-  let g:terminal_color_10 = "#90A959"
-  let g:terminal_color_11 = "#F4BF75"
-  let g:terminal_color_12 = "#6A9FB5"
-  let g:terminal_color_13 = "#AA759F"
-  let g:terminal_color_14 = "#75B5AA"
+  let g:terminal_color_8 =  "#b0b0b0"
+  let g:terminal_color_9 =  "#ac4142"
+  let g:terminal_color_10 = "#90a959"
+  let g:terminal_color_11 = "#f4bf75"
+  let g:terminal_color_12 = "#6a9fb5"
+  let g:terminal_color_13 = "#aa759f"
+  let g:terminal_color_14 = "#75b5aa"
   let g:terminal_color_15 = "#151515"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -123,21 +123,21 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#F5F5F5",
-        \ "#AC4142",
-        \ "#90A959",
-        \ "#F4BF75",
-        \ "#6A9FB5",
-        \ "#AA759F",
-        \ "#75B5AA",
+        \ "#f5f5f5",
+        \ "#ac4142",
+        \ "#90a959",
+        \ "#f4bf75",
+        \ "#6a9fb5",
+        \ "#aa759f",
+        \ "#75b5aa",
         \ "#303030",
-        \ "#B0B0B0",
-        \ "#AC4142",
-        \ "#90A959",
-        \ "#F4BF75",
-        \ "#6A9FB5",
-        \ "#AA759F",
-        \ "#75B5AA",
+        \ "#b0b0b0",
+        \ "#ac4142",
+        \ "#90a959",
+        \ "#f4bf75",
+        \ "#6a9fb5",
+        \ "#aa759f",
+        \ "#75b5aa",
         \ "#151515",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index 143ef60..4b8d36e 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-colors.vim b/colors/base16-colors.vim
index f67f5de..453644b 100644
--- a/colors/base16-colors.vim
+++ b/colors/base16-colors.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim
index fe350d8..6d5689e 100644
--- a/colors/base16-cupcake.vim
+++ b/colors/base16-cupcake.vim
@@ -27,26 +27,26 @@ let s:gui04        = "a59daf"
 let g:base16_gui04 = "a59daf"
 let s:gui05        = "8b8198"
 let g:base16_gui05 = "8b8198"
-let s:gui06        = "72677E"
-let g:base16_gui06 = "72677E"
+let s:gui06        = "72677e"
+let g:base16_gui06 = "72677e"
 let s:gui07        = "585062"
 let g:base16_gui07 = "585062"
-let s:gui08        = "D57E85"
-let g:base16_gui08 = "D57E85"
-let s:gui09        = "EBB790"
-let g:base16_gui09 = "EBB790"
-let s:gui0A        = "DCB16C"
-let g:base16_gui0A = "DCB16C"
-let s:gui0B        = "A3B367"
-let g:base16_gui0B = "A3B367"
-let s:gui0C        = "69A9A7"
-let g:base16_gui0C = "69A9A7"
-let s:gui0D        = "7297B9"
-let g:base16_gui0D = "7297B9"
-let s:gui0E        = "BB99B4"
-let g:base16_gui0E = "BB99B4"
-let s:gui0F        = "BAA58C"
-let g:base16_gui0F = "BAA58C"
+let s:gui08        = "d57e85"
+let g:base16_gui08 = "d57e85"
+let s:gui09        = "ebb790"
+let g:base16_gui09 = "ebb790"
+let s:gui0A        = "dcb16c"
+let g:base16_gui0A = "dcb16c"
+let s:gui0B        = "a3b367"
+let g:base16_gui0B = "a3b367"
+let s:gui0C        = "69a9a7"
+let g:base16_gui0C = "69a9a7"
+let s:gui0D        = "7297b9"
+let g:base16_gui0D = "7297b9"
+let s:gui0E        = "bb99b4"
+let g:base16_gui0E = "bb99b4"
+let s:gui0F        = "baa58c"
+let g:base16_gui0F = "baa58c"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,20 +100,20 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#fbf1f2"
-  let g:terminal_color_1 =  "#D57E85"
-  let g:terminal_color_2 =  "#A3B367"
-  let g:terminal_color_3 =  "#DCB16C"
-  let g:terminal_color_4 =  "#7297B9"
-  let g:terminal_color_5 =  "#BB99B4"
-  let g:terminal_color_6 =  "#69A9A7"
+  let g:terminal_color_1 =  "#d57e85"
+  let g:terminal_color_2 =  "#a3b367"
+  let g:terminal_color_3 =  "#dcb16c"
+  let g:terminal_color_4 =  "#7297b9"
+  let g:terminal_color_5 =  "#bb99b4"
+  let g:terminal_color_6 =  "#69a9a7"
   let g:terminal_color_7 =  "#8b8198"
   let g:terminal_color_8 =  "#bfb9c6"
-  let g:terminal_color_9 =  "#D57E85"
-  let g:terminal_color_10 = "#A3B367"
-  let g:terminal_color_11 = "#DCB16C"
-  let g:terminal_color_12 = "#7297B9"
-  let g:terminal_color_13 = "#BB99B4"
-  let g:terminal_color_14 = "#69A9A7"
+  let g:terminal_color_9 =  "#d57e85"
+  let g:terminal_color_10 = "#a3b367"
+  let g:terminal_color_11 = "#dcb16c"
+  let g:terminal_color_12 = "#7297b9"
+  let g:terminal_color_13 = "#bb99b4"
+  let g:terminal_color_14 = "#69a9a7"
   let g:terminal_color_15 = "#585062"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -124,20 +124,20 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#fbf1f2",
-        \ "#D57E85",
-        \ "#A3B367",
-        \ "#DCB16C",
-        \ "#7297B9",
-        \ "#BB99B4",
-        \ "#69A9A7",
+        \ "#d57e85",
+        \ "#a3b367",
+        \ "#dcb16c",
+        \ "#7297b9",
+        \ "#bb99b4",
+        \ "#69a9a7",
         \ "#8b8198",
         \ "#bfb9c6",
-        \ "#D57E85",
-        \ "#A3B367",
-        \ "#DCB16C",
-        \ "#7297B9",
-        \ "#BB99B4",
-        \ "#69A9A7",
+        \ "#d57e85",
+        \ "#a3b367",
+        \ "#dcb16c",
+        \ "#7297b9",
+        \ "#bb99b4",
+        \ "#69a9a7",
         \ "#585062",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim
index 5708cab..dfd846f 100644
--- a/colors/base16-cupertino.vim
+++ b/colors/base16-cupertino.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-da-one-black.vim b/colors/base16-da-one-black.vim
new file mode 100644
index 0000000..ebfe5f2
--- /dev/null
+++ b/colors/base16-da-one-black.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Da One Black scheme by NNB (https://github.com/NNBnh)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-da-one-black.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "000000"
+let g:base16_gui00 = "000000"
+let s:gui01        = "282828"
+let g:base16_gui01 = "282828"
+let s:gui02        = "585858"
+let g:base16_gui02 = "585858"
+let s:gui03        = "888888"
+let g:base16_gui03 = "888888"
+let s:gui04        = "c8c8c8"
+let g:base16_gui04 = "c8c8c8"
+let s:gui05        = "ffffff"
+let g:base16_gui05 = "ffffff"
+let s:gui06        = "ffffff"
+let g:base16_gui06 = "ffffff"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "fa7883"
+let g:base16_gui08 = "fa7883"
+let s:gui09        = "ffc387"
+let g:base16_gui09 = "ffc387"
+let s:gui0A        = "ff9470"
+let g:base16_gui0A = "ff9470"
+let s:gui0B        = "98c379"
+let g:base16_gui0B = "98c379"
+let s:gui0C        = "8af5ff"
+let g:base16_gui0C = "8af5ff"
+let s:gui0D        = "6bb8ff"
+let g:base16_gui0D = "6bb8ff"
+let s:gui0E        = "e799ff"
+let g:base16_gui0E = "e799ff"
+let s:gui0F        = "b3684f"
+let g:base16_gui0F = "b3684f"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#000000"
+  let g:terminal_color_1 =  "#fa7883"
+  let g:terminal_color_2 =  "#98c379"
+  let g:terminal_color_3 =  "#ff9470"
+  let g:terminal_color_4 =  "#6bb8ff"
+  let g:terminal_color_5 =  "#e799ff"
+  let g:terminal_color_6 =  "#8af5ff"
+  let g:terminal_color_7 =  "#ffffff"
+  let g:terminal_color_8 =  "#888888"
+  let g:terminal_color_9 =  "#fa7883"
+  let g:terminal_color_10 = "#98c379"
+  let g:terminal_color_11 = "#ff9470"
+  let g:terminal_color_12 = "#6bb8ff"
+  let g:terminal_color_13 = "#e799ff"
+  let g:terminal_color_14 = "#8af5ff"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#000000",
+        \ "#fa7883",
+        \ "#98c379",
+        \ "#ff9470",
+        \ "#6bb8ff",
+        \ "#e799ff",
+        \ "#8af5ff",
+        \ "#ffffff",
+        \ "#888888",
+        \ "#fa7883",
+        \ "#98c379",
+        \ "#ff9470",
+        \ "#6bb8ff",
+        \ "#e799ff",
+        \ "#8af5ff",
+        \ "#ffffff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-da-one-black"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-da-one-gray.vim b/colors/base16-da-one-gray.vim
new file mode 100644
index 0000000..dbf7916
--- /dev/null
+++ b/colors/base16-da-one-gray.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Da One Gray scheme by NNB (https://github.com/NNBnh)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-da-one-gray.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "181818"
+let g:base16_gui00 = "181818"
+let s:gui01        = "282828"
+let g:base16_gui01 = "282828"
+let s:gui02        = "585858"
+let g:base16_gui02 = "585858"
+let s:gui03        = "888888"
+let g:base16_gui03 = "888888"
+let s:gui04        = "c8c8c8"
+let g:base16_gui04 = "c8c8c8"
+let s:gui05        = "ffffff"
+let g:base16_gui05 = "ffffff"
+let s:gui06        = "ffffff"
+let g:base16_gui06 = "ffffff"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "fa7883"
+let g:base16_gui08 = "fa7883"
+let s:gui09        = "ffc387"
+let g:base16_gui09 = "ffc387"
+let s:gui0A        = "ff9470"
+let g:base16_gui0A = "ff9470"
+let s:gui0B        = "98c379"
+let g:base16_gui0B = "98c379"
+let s:gui0C        = "8af5ff"
+let g:base16_gui0C = "8af5ff"
+let s:gui0D        = "6bb8ff"
+let g:base16_gui0D = "6bb8ff"
+let s:gui0E        = "e799ff"
+let g:base16_gui0E = "e799ff"
+let s:gui0F        = "b3684f"
+let g:base16_gui0F = "b3684f"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#181818"
+  let g:terminal_color_1 =  "#fa7883"
+  let g:terminal_color_2 =  "#98c379"
+  let g:terminal_color_3 =  "#ff9470"
+  let g:terminal_color_4 =  "#6bb8ff"
+  let g:terminal_color_5 =  "#e799ff"
+  let g:terminal_color_6 =  "#8af5ff"
+  let g:terminal_color_7 =  "#ffffff"
+  let g:terminal_color_8 =  "#888888"
+  let g:terminal_color_9 =  "#fa7883"
+  let g:terminal_color_10 = "#98c379"
+  let g:terminal_color_11 = "#ff9470"
+  let g:terminal_color_12 = "#6bb8ff"
+  let g:terminal_color_13 = "#e799ff"
+  let g:terminal_color_14 = "#8af5ff"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#181818",
+        \ "#fa7883",
+        \ "#98c379",
+        \ "#ff9470",
+        \ "#6bb8ff",
+        \ "#e799ff",
+        \ "#8af5ff",
+        \ "#ffffff",
+        \ "#888888",
+        \ "#fa7883",
+        \ "#98c379",
+        \ "#ff9470",
+        \ "#6bb8ff",
+        \ "#e799ff",
+        \ "#8af5ff",
+        \ "#ffffff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-da-one-gray"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-da-one-ocean.vim b/colors/base16-da-one-ocean.vim
new file mode 100644
index 0000000..c7f19ca
--- /dev/null
+++ b/colors/base16-da-one-ocean.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Da One Ocean scheme by NNB (https://github.com/NNBnh)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-da-one-ocean.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "171726"
+let g:base16_gui00 = "171726"
+let s:gui01        = "22273d"
+let g:base16_gui01 = "22273d"
+let s:gui02        = "525866"
+let g:base16_gui02 = "525866"
+let s:gui03        = "878d96"
+let g:base16_gui03 = "878d96"
+let s:gui04        = "c8c8c8"
+let g:base16_gui04 = "c8c8c8"
+let s:gui05        = "ffffff"
+let g:base16_gui05 = "ffffff"
+let s:gui06        = "ffffff"
+let g:base16_gui06 = "ffffff"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "fa7883"
+let g:base16_gui08 = "fa7883"
+let s:gui09        = "ffc387"
+let g:base16_gui09 = "ffc387"
+let s:gui0A        = "ff9470"
+let g:base16_gui0A = "ff9470"
+let s:gui0B        = "98c379"
+let g:base16_gui0B = "98c379"
+let s:gui0C        = "8af5ff"
+let g:base16_gui0C = "8af5ff"
+let s:gui0D        = "6bb8ff"
+let g:base16_gui0D = "6bb8ff"
+let s:gui0E        = "e799ff"
+let g:base16_gui0E = "e799ff"
+let s:gui0F        = "b3684f"
+let g:base16_gui0F = "b3684f"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#171726"
+  let g:terminal_color_1 =  "#fa7883"
+  let g:terminal_color_2 =  "#98c379"
+  let g:terminal_color_3 =  "#ff9470"
+  let g:terminal_color_4 =  "#6bb8ff"
+  let g:terminal_color_5 =  "#e799ff"
+  let g:terminal_color_6 =  "#8af5ff"
+  let g:terminal_color_7 =  "#ffffff"
+  let g:terminal_color_8 =  "#878d96"
+  let g:terminal_color_9 =  "#fa7883"
+  let g:terminal_color_10 = "#98c379"
+  let g:terminal_color_11 = "#ff9470"
+  let g:terminal_color_12 = "#6bb8ff"
+  let g:terminal_color_13 = "#e799ff"
+  let g:terminal_color_14 = "#8af5ff"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#171726",
+        \ "#fa7883",
+        \ "#98c379",
+        \ "#ff9470",
+        \ "#6bb8ff",
+        \ "#e799ff",
+        \ "#8af5ff",
+        \ "#ffffff",
+        \ "#878d96",
+        \ "#fa7883",
+        \ "#98c379",
+        \ "#ff9470",
+        \ "#6bb8ff",
+        \ "#e799ff",
+        \ "#8af5ff",
+        \ "#ffffff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-da-one-ocean"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-da-one-paper.vim b/colors/base16-da-one-paper.vim
new file mode 100644
index 0000000..0818220
--- /dev/null
+++ b/colors/base16-da-one-paper.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Da One Paper scheme by NNB (https://github.com/NNBnh)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-da-one-paper.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "faf0dc"
+let g:base16_gui00 = "faf0dc"
+let s:gui01        = "c8c8c8"
+let g:base16_gui01 = "c8c8c8"
+let s:gui02        = "888888"
+let g:base16_gui02 = "888888"
+let s:gui03        = "585858"
+let g:base16_gui03 = "585858"
+let s:gui04        = "282828"
+let g:base16_gui04 = "282828"
+let s:gui05        = "181818"
+let g:base16_gui05 = "181818"
+let s:gui06        = "000000"
+let g:base16_gui06 = "000000"
+let s:gui07        = "000000"
+let g:base16_gui07 = "000000"
+let s:gui08        = "de5d6e"
+let g:base16_gui08 = "de5d6e"
+let s:gui09        = "ff9470"
+let g:base16_gui09 = "ff9470"
+let s:gui0A        = "b3684f"
+let g:base16_gui0A = "b3684f"
+let s:gui0B        = "76a85d"
+let g:base16_gui0B = "76a85d"
+let s:gui0C        = "64b5a7"
+let g:base16_gui0C = "64b5a7"
+let s:gui0D        = "5890f8"
+let g:base16_gui0D = "5890f8"
+let s:gui0E        = "c173d1"
+let g:base16_gui0E = "c173d1"
+let s:gui0F        = "b3684f"
+let g:base16_gui0F = "b3684f"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#faf0dc"
+  let g:terminal_color_1 =  "#de5d6e"
+  let g:terminal_color_2 =  "#76a85d"
+  let g:terminal_color_3 =  "#b3684f"
+  let g:terminal_color_4 =  "#5890f8"
+  let g:terminal_color_5 =  "#c173d1"
+  let g:terminal_color_6 =  "#64b5a7"
+  let g:terminal_color_7 =  "#181818"
+  let g:terminal_color_8 =  "#585858"
+  let g:terminal_color_9 =  "#de5d6e"
+  let g:terminal_color_10 = "#76a85d"
+  let g:terminal_color_11 = "#b3684f"
+  let g:terminal_color_12 = "#5890f8"
+  let g:terminal_color_13 = "#c173d1"
+  let g:terminal_color_14 = "#64b5a7"
+  let g:terminal_color_15 = "#000000"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#faf0dc",
+        \ "#de5d6e",
+        \ "#76a85d",
+        \ "#b3684f",
+        \ "#5890f8",
+        \ "#c173d1",
+        \ "#64b5a7",
+        \ "#181818",
+        \ "#585858",
+        \ "#de5d6e",
+        \ "#76a85d",
+        \ "#b3684f",
+        \ "#5890f8",
+        \ "#c173d1",
+        \ "#64b5a7",
+        \ "#000000",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-da-one-paper"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-da-one-sea.vim b/colors/base16-da-one-sea.vim
new file mode 100644
index 0000000..637316c
--- /dev/null
+++ b/colors/base16-da-one-sea.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Da One Sea scheme by NNB (https://github.com/NNBnh)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-da-one-sea.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "22273d"
+let g:base16_gui00 = "22273d"
+let s:gui01        = "374059"
+let g:base16_gui01 = "374059"
+let s:gui02        = "525866"
+let g:base16_gui02 = "525866"
+let s:gui03        = "878d96"
+let g:base16_gui03 = "878d96"
+let s:gui04        = "c8c8c8"
+let g:base16_gui04 = "c8c8c8"
+let s:gui05        = "ffffff"
+let g:base16_gui05 = "ffffff"
+let s:gui06        = "ffffff"
+let g:base16_gui06 = "ffffff"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "fa7883"
+let g:base16_gui08 = "fa7883"
+let s:gui09        = "ffc387"
+let g:base16_gui09 = "ffc387"
+let s:gui0A        = "ff9470"
+let g:base16_gui0A = "ff9470"
+let s:gui0B        = "98c379"
+let g:base16_gui0B = "98c379"
+let s:gui0C        = "8af5ff"
+let g:base16_gui0C = "8af5ff"
+let s:gui0D        = "6bb8ff"
+let g:base16_gui0D = "6bb8ff"
+let s:gui0E        = "e799ff"
+let g:base16_gui0E = "e799ff"
+let s:gui0F        = "b3684f"
+let g:base16_gui0F = "b3684f"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#22273d"
+  let g:terminal_color_1 =  "#fa7883"
+  let g:terminal_color_2 =  "#98c379"
+  let g:terminal_color_3 =  "#ff9470"
+  let g:terminal_color_4 =  "#6bb8ff"
+  let g:terminal_color_5 =  "#e799ff"
+  let g:terminal_color_6 =  "#8af5ff"
+  let g:terminal_color_7 =  "#ffffff"
+  let g:terminal_color_8 =  "#878d96"
+  let g:terminal_color_9 =  "#fa7883"
+  let g:terminal_color_10 = "#98c379"
+  let g:terminal_color_11 = "#ff9470"
+  let g:terminal_color_12 = "#6bb8ff"
+  let g:terminal_color_13 = "#e799ff"
+  let g:terminal_color_14 = "#8af5ff"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#22273d",
+        \ "#fa7883",
+        \ "#98c379",
+        \ "#ff9470",
+        \ "#6bb8ff",
+        \ "#e799ff",
+        \ "#8af5ff",
+        \ "#ffffff",
+        \ "#878d96",
+        \ "#fa7883",
+        \ "#98c379",
+        \ "#ff9470",
+        \ "#6bb8ff",
+        \ "#e799ff",
+        \ "#8af5ff",
+        \ "#ffffff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-da-one-sea"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-da-one-white.vim b/colors/base16-da-one-white.vim
new file mode 100644
index 0000000..21ec25d
--- /dev/null
+++ b/colors/base16-da-one-white.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Da One White scheme by NNB (https://github.com/NNBnh)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-da-one-white.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "ffffff"
+let g:base16_gui00 = "ffffff"
+let s:gui01        = "c8c8c8"
+let g:base16_gui01 = "c8c8c8"
+let s:gui02        = "888888"
+let g:base16_gui02 = "888888"
+let s:gui03        = "585858"
+let g:base16_gui03 = "585858"
+let s:gui04        = "282828"
+let g:base16_gui04 = "282828"
+let s:gui05        = "181818"
+let g:base16_gui05 = "181818"
+let s:gui06        = "000000"
+let g:base16_gui06 = "000000"
+let s:gui07        = "000000"
+let g:base16_gui07 = "000000"
+let s:gui08        = "de5d6e"
+let g:base16_gui08 = "de5d6e"
+let s:gui09        = "ff9470"
+let g:base16_gui09 = "ff9470"
+let s:gui0A        = "b3684f"
+let g:base16_gui0A = "b3684f"
+let s:gui0B        = "76a85d"
+let g:base16_gui0B = "76a85d"
+let s:gui0C        = "64b5a7"
+let g:base16_gui0C = "64b5a7"
+let s:gui0D        = "5890f8"
+let g:base16_gui0D = "5890f8"
+let s:gui0E        = "c173d1"
+let g:base16_gui0E = "c173d1"
+let s:gui0F        = "b3684f"
+let g:base16_gui0F = "b3684f"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#ffffff"
+  let g:terminal_color_1 =  "#de5d6e"
+  let g:terminal_color_2 =  "#76a85d"
+  let g:terminal_color_3 =  "#b3684f"
+  let g:terminal_color_4 =  "#5890f8"
+  let g:terminal_color_5 =  "#c173d1"
+  let g:terminal_color_6 =  "#64b5a7"
+  let g:terminal_color_7 =  "#181818"
+  let g:terminal_color_8 =  "#585858"
+  let g:terminal_color_9 =  "#de5d6e"
+  let g:terminal_color_10 = "#76a85d"
+  let g:terminal_color_11 = "#b3684f"
+  let g:terminal_color_12 = "#5890f8"
+  let g:terminal_color_13 = "#c173d1"
+  let g:terminal_color_14 = "#64b5a7"
+  let g:terminal_color_15 = "#000000"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#ffffff",
+        \ "#de5d6e",
+        \ "#76a85d",
+        \ "#b3684f",
+        \ "#5890f8",
+        \ "#c173d1",
+        \ "#64b5a7",
+        \ "#181818",
+        \ "#585858",
+        \ "#de5d6e",
+        \ "#76a85d",
+        \ "#b3684f",
+        \ "#5890f8",
+        \ "#c173d1",
+        \ "#64b5a7",
+        \ "#000000",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-da-one-white"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-danqing.vim b/colors/base16-danqing.vim
index 23cf05d..e6a99ce 100644
--- a/colors/base16-danqing.vim
+++ b/colors/base16-danqing.vim
@@ -25,28 +25,28 @@ let s:gui03        = "9da8a3"
 let g:base16_gui03 = "9da8a3"
 let s:gui04        = "cad8d2"
 let g:base16_gui04 = "cad8d2"
-let s:gui05        = "e0f0eF"
-let g:base16_gui05 = "e0f0eF"
+let s:gui05        = "e0f0ef"
+let g:base16_gui05 = "e0f0ef"
 let s:gui06        = "ecf6f2"
 let g:base16_gui06 = "ecf6f2"
 let s:gui07        = "fcfefd"
 let g:base16_gui07 = "fcfefd"
-let s:gui08        = "F9906F"
-let g:base16_gui08 = "F9906F"
-let s:gui09        = "B38A61"
-let g:base16_gui09 = "B38A61"
-let s:gui0A        = "F0C239"
-let g:base16_gui0A = "F0C239"
-let s:gui0B        = "8AB361"
-let g:base16_gui0B = "8AB361"
-let s:gui0C        = "30DFF3"
-let g:base16_gui0C = "30DFF3"
-let s:gui0D        = "B0A4E3"
-let g:base16_gui0D = "B0A4E3"
-let s:gui0E        = "CCA4E3"
-let g:base16_gui0E = "CCA4E3"
-let s:gui0F        = "CA6924"
-let g:base16_gui0F = "CA6924"
+let s:gui08        = "f9906f"
+let g:base16_gui08 = "f9906f"
+let s:gui09        = "b38a61"
+let g:base16_gui09 = "b38a61"
+let s:gui0A        = "f0c239"
+let g:base16_gui0A = "f0c239"
+let s:gui0B        = "8ab361"
+let g:base16_gui0B = "8ab361"
+let s:gui0C        = "30dff3"
+let g:base16_gui0C = "30dff3"
+let s:gui0D        = "b0a4e3"
+let g:base16_gui0D = "b0a4e3"
+let s:gui0E        = "cca4e3"
+let g:base16_gui0E = "cca4e3"
+let s:gui0F        = "ca6924"
+let g:base16_gui0F = "ca6924"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,20 +100,20 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#2d302f"
-  let g:terminal_color_1 =  "#F9906F"
-  let g:terminal_color_2 =  "#8AB361"
-  let g:terminal_color_3 =  "#F0C239"
-  let g:terminal_color_4 =  "#B0A4E3"
-  let g:terminal_color_5 =  "#CCA4E3"
-  let g:terminal_color_6 =  "#30DFF3"
-  let g:terminal_color_7 =  "#e0f0eF"
+  let g:terminal_color_1 =  "#f9906f"
+  let g:terminal_color_2 =  "#8ab361"
+  let g:terminal_color_3 =  "#f0c239"
+  let g:terminal_color_4 =  "#b0a4e3"
+  let g:terminal_color_5 =  "#cca4e3"
+  let g:terminal_color_6 =  "#30dff3"
+  let g:terminal_color_7 =  "#e0f0ef"
   let g:terminal_color_8 =  "#9da8a3"
-  let g:terminal_color_9 =  "#F9906F"
-  let g:terminal_color_10 = "#8AB361"
-  let g:terminal_color_11 = "#F0C239"
-  let g:terminal_color_12 = "#B0A4E3"
-  let g:terminal_color_13 = "#CCA4E3"
-  let g:terminal_color_14 = "#30DFF3"
+  let g:terminal_color_9 =  "#f9906f"
+  let g:terminal_color_10 = "#8ab361"
+  let g:terminal_color_11 = "#f0c239"
+  let g:terminal_color_12 = "#b0a4e3"
+  let g:terminal_color_13 = "#cca4e3"
+  let g:terminal_color_14 = "#30dff3"
   let g:terminal_color_15 = "#fcfefd"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -124,20 +124,20 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#2d302f",
-        \ "#F9906F",
-        \ "#8AB361",
-        \ "#F0C239",
-        \ "#B0A4E3",
-        \ "#CCA4E3",
-        \ "#30DFF3",
-        \ "#e0f0eF",
+        \ "#f9906f",
+        \ "#8ab361",
+        \ "#f0c239",
+        \ "#b0a4e3",
+        \ "#cca4e3",
+        \ "#30dff3",
+        \ "#e0f0ef",
         \ "#9da8a3",
-        \ "#F9906F",
-        \ "#8AB361",
-        \ "#F0C239",
-        \ "#B0A4E3",
-        \ "#CCA4E3",
-        \ "#30DFF3",
+        \ "#f9906f",
+        \ "#8ab361",
+        \ "#f0c239",
+        \ "#b0a4e3",
+        \ "#cca4e3",
+        \ "#30dff3",
         \ "#fcfefd",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-darcula.vim b/colors/base16-darcula.vim
index d28d044..88f77a7 100644
--- a/colors/base16-darcula.vim
+++ b/colors/base16-darcula.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-darkmoss.vim b/colors/base16-darkmoss.vim
index bfee12e..9f3403b 100644
--- a/colors/base16-darkmoss.vim
+++ b/colors/base16-darkmoss.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim
index f94bca3..00d98f4 100644
--- a/colors/base16-darktooth.vim
+++ b/colors/base16-darktooth.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "1D2021"
-let g:base16_gui00 = "1D2021"
-let s:gui01        = "32302F"
-let g:base16_gui01 = "32302F"
+let s:gui00        = "1d2021"
+let g:base16_gui00 = "1d2021"
+let s:gui01        = "32302f"
+let g:base16_gui01 = "32302f"
 let s:gui02        = "504945"
 let g:base16_gui02 = "504945"
-let s:gui03        = "665C54"
-let g:base16_gui03 = "665C54"
+let s:gui03        = "665c54"
+let g:base16_gui03 = "665c54"
 let s:gui04        = "928374"
 let g:base16_gui04 = "928374"
-let s:gui05        = "A89984"
-let g:base16_gui05 = "A89984"
-let s:gui06        = "D5C4A1"
-let g:base16_gui06 = "D5C4A1"
-let s:gui07        = "FDF4C1"
-let g:base16_gui07 = "FDF4C1"
-let s:gui08        = "FB543F"
-let g:base16_gui08 = "FB543F"
-let s:gui09        = "FE8625"
-let g:base16_gui09 = "FE8625"
-let s:gui0A        = "FAC03B"
-let g:base16_gui0A = "FAC03B"
-let s:gui0B        = "95C085"
-let g:base16_gui0B = "95C085"
-let s:gui0C        = "8BA59B"
-let g:base16_gui0C = "8BA59B"
-let s:gui0D        = "0D6678"
-let g:base16_gui0D = "0D6678"
-let s:gui0E        = "8F4673"
-let g:base16_gui0E = "8F4673"
-let s:gui0F        = "A87322"
-let g:base16_gui0F = "A87322"
+let s:gui05        = "a89984"
+let g:base16_gui05 = "a89984"
+let s:gui06        = "d5c4a1"
+let g:base16_gui06 = "d5c4a1"
+let s:gui07        = "fdf4c1"
+let g:base16_gui07 = "fdf4c1"
+let s:gui08        = "fb543f"
+let g:base16_gui08 = "fb543f"
+let s:gui09        = "fe8625"
+let g:base16_gui09 = "fe8625"
+let s:gui0A        = "fac03b"
+let g:base16_gui0A = "fac03b"
+let s:gui0B        = "95c085"
+let g:base16_gui0B = "95c085"
+let s:gui0C        = "8ba59b"
+let g:base16_gui0C = "8ba59b"
+let s:gui0D        = "0d6678"
+let g:base16_gui0D = "0d6678"
+let s:gui0E        = "8f4673"
+let g:base16_gui0E = "8f4673"
+let s:gui0F        = "a87322"
+let g:base16_gui0F = "a87322"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#1D2021"
-  let g:terminal_color_1 =  "#FB543F"
-  let g:terminal_color_2 =  "#95C085"
-  let g:terminal_color_3 =  "#FAC03B"
-  let g:terminal_color_4 =  "#0D6678"
-  let g:terminal_color_5 =  "#8F4673"
-  let g:terminal_color_6 =  "#8BA59B"
-  let g:terminal_color_7 =  "#A89984"
-  let g:terminal_color_8 =  "#665C54"
-  let g:terminal_color_9 =  "#FB543F"
-  let g:terminal_color_10 = "#95C085"
-  let g:terminal_color_11 = "#FAC03B"
-  let g:terminal_color_12 = "#0D6678"
-  let g:terminal_color_13 = "#8F4673"
-  let g:terminal_color_14 = "#8BA59B"
-  let g:terminal_color_15 = "#FDF4C1"
+  let g:terminal_color_0 =  "#1d2021"
+  let g:terminal_color_1 =  "#fb543f"
+  let g:terminal_color_2 =  "#95c085"
+  let g:terminal_color_3 =  "#fac03b"
+  let g:terminal_color_4 =  "#0d6678"
+  let g:terminal_color_5 =  "#8f4673"
+  let g:terminal_color_6 =  "#8ba59b"
+  let g:terminal_color_7 =  "#a89984"
+  let g:terminal_color_8 =  "#665c54"
+  let g:terminal_color_9 =  "#fb543f"
+  let g:terminal_color_10 = "#95c085"
+  let g:terminal_color_11 = "#fac03b"
+  let g:terminal_color_12 = "#0d6678"
+  let g:terminal_color_13 = "#8f4673"
+  let g:terminal_color_14 = "#8ba59b"
+  let g:terminal_color_15 = "#fdf4c1"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#1D2021",
-        \ "#FB543F",
-        \ "#95C085",
-        \ "#FAC03B",
-        \ "#0D6678",
-        \ "#8F4673",
-        \ "#8BA59B",
-        \ "#A89984",
-        \ "#665C54",
-        \ "#FB543F",
-        \ "#95C085",
-        \ "#FAC03B",
-        \ "#0D6678",
-        \ "#8F4673",
-        \ "#8BA59B",
-        \ "#FDF4C1",
+        \ "#1d2021",
+        \ "#fb543f",
+        \ "#95c085",
+        \ "#fac03b",
+        \ "#0d6678",
+        \ "#8f4673",
+        \ "#8ba59b",
+        \ "#a89984",
+        \ "#665c54",
+        \ "#fb543f",
+        \ "#95c085",
+        \ "#fac03b",
+        \ "#0d6678",
+        \ "#8f4673",
+        \ "#8ba59b",
+        \ "#fdf4c1",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-darkviolet.vim b/colors/base16-darkviolet.vim
index 0e7cee7..3c30f83 100644
--- a/colors/base16-darkviolet.vim
+++ b/colors/base16-darkviolet.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-decaf.vim b/colors/base16-decaf.vim
index 95ba48f..5fae90f 100644
--- a/colors/base16-decaf.vim
+++ b/colors/base16-decaf.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim
index 93b8951..f3e34a2 100644
--- a/colors/base16-default-dark.vim
+++ b/colors/base16-default-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim
index 9684636..1383e40 100644
--- a/colors/base16-default-light.vim
+++ b/colors/base16-default-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-dirtysea.vim b/colors/base16-dirtysea.vim
index 9e48fa9..77656e4 100644
--- a/colors/base16-dirtysea.vim
+++ b/colors/base16-dirtysea.vim
@@ -35,18 +35,18 @@ let s:gui08        = "840000"
 let g:base16_gui08 = "840000"
 let s:gui09        = "006565"
 let g:base16_gui09 = "006565"
-let s:gui0A        = "755B00"
-let g:base16_gui0A = "755B00"
+let s:gui0A        = "755b00"
+let g:base16_gui0A = "755b00"
 let s:gui0B        = "730073"
 let g:base16_gui0B = "730073"
-let s:gui0C        = "755B00"
-let g:base16_gui0C = "755B00"
+let s:gui0C        = "755b00"
+let g:base16_gui0C = "755b00"
 let s:gui0D        = "007300"
 let g:base16_gui0D = "007300"
 let s:gui0E        = "000090"
 let g:base16_gui0E = "000090"
-let s:gui0F        = "755B00"
-let g:base16_gui0F = "755B00"
+let s:gui0F        = "755b00"
+let g:base16_gui0F = "755b00"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -102,18 +102,18 @@ if has("nvim")
   let g:terminal_color_0 =  "#e0e0e0"
   let g:terminal_color_1 =  "#840000"
   let g:terminal_color_2 =  "#730073"
-  let g:terminal_color_3 =  "#755B00"
+  let g:terminal_color_3 =  "#755b00"
   let g:terminal_color_4 =  "#007300"
   let g:terminal_color_5 =  "#000090"
-  let g:terminal_color_6 =  "#755B00"
+  let g:terminal_color_6 =  "#755b00"
   let g:terminal_color_7 =  "#000000"
   let g:terminal_color_8 =  "#707070"
   let g:terminal_color_9 =  "#840000"
   let g:terminal_color_10 = "#730073"
-  let g:terminal_color_11 = "#755B00"
+  let g:terminal_color_11 = "#755b00"
   let g:terminal_color_12 = "#007300"
   let g:terminal_color_13 = "#000090"
-  let g:terminal_color_14 = "#755B00"
+  let g:terminal_color_14 = "#755b00"
   let g:terminal_color_15 = "#c4d9c4"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -126,18 +126,18 @@ elseif has("terminal")
         \ "#e0e0e0",
         \ "#840000",
         \ "#730073",
-        \ "#755B00",
+        \ "#755b00",
         \ "#007300",
         \ "#000090",
-        \ "#755B00",
+        \ "#755b00",
         \ "#000000",
         \ "#707070",
         \ "#840000",
         \ "#730073",
-        \ "#755B00",
+        \ "#755b00",
         \ "#007300",
         \ "#000090",
-        \ "#755B00",
+        \ "#755b00",
         \ "#c4d9c4",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim
index c87406d..d024db8 100644
--- a/colors/base16-dracula.vim
+++ b/colors/base16-dracula.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-edge-dark.vim b/colors/base16-edge-dark.vim
index 66ccd2a..5a2492a 100644
--- a/colors/base16-edge-dark.vim
+++ b/colors/base16-edge-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-edge-light.vim b/colors/base16-edge-light.vim
index cb7f303..3477f95 100644
--- a/colors/base16-edge-light.vim
+++ b/colors/base16-edge-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 29b712d..b7e744a 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 572d7e6..5acfdd4 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -15,36 +15,36 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "16130F"
-let g:base16_gui00 = "16130F"
-let s:gui01        = "2C2620"
-let g:base16_gui01 = "2C2620"
-let s:gui02        = "433B32"
-let g:base16_gui02 = "433B32"
-let s:gui03        = "5A5047"
-let g:base16_gui03 = "5A5047"
-let s:gui04        = "8A8075"
-let g:base16_gui04 = "8A8075"
-let s:gui05        = "A39A90"
-let g:base16_gui05 = "A39A90"
-let s:gui06        = "BEB6AE"
-let g:base16_gui06 = "BEB6AE"
-let s:gui07        = "DBD6D1"
-let g:base16_gui07 = "DBD6D1"
-let s:gui08        = "826D57"
-let g:base16_gui08 = "826D57"
+let s:gui00        = "16130f"
+let g:base16_gui00 = "16130f"
+let s:gui01        = "2c2620"
+let g:base16_gui01 = "2c2620"
+let s:gui02        = "433b32"
+let g:base16_gui02 = "433b32"
+let s:gui03        = "5a5047"
+let g:base16_gui03 = "5a5047"
+let s:gui04        = "8a8075"
+let g:base16_gui04 = "8a8075"
+let s:gui05        = "a39a90"
+let g:base16_gui05 = "a39a90"
+let s:gui06        = "beb6ae"
+let g:base16_gui06 = "beb6ae"
+let s:gui07        = "dbd6d1"
+let g:base16_gui07 = "dbd6d1"
+let s:gui08        = "826d57"
+let g:base16_gui08 = "826d57"
 let s:gui09        = "828257"
 let g:base16_gui09 = "828257"
-let s:gui0A        = "6D8257"
-let g:base16_gui0A = "6D8257"
-let s:gui0B        = "57826D"
-let g:base16_gui0B = "57826D"
-let s:gui0C        = "576D82"
-let g:base16_gui0C = "576D82"
-let s:gui0D        = "6D5782"
-let g:base16_gui0D = "6D5782"
-let s:gui0E        = "82576D"
-let g:base16_gui0E = "82576D"
+let s:gui0A        = "6d8257"
+let g:base16_gui0A = "6d8257"
+let s:gui0B        = "57826d"
+let g:base16_gui0B = "57826d"
+let s:gui0C        = "576d82"
+let g:base16_gui0C = "576d82"
+let s:gui0D        = "6d5782"
+let g:base16_gui0D = "6d5782"
+let s:gui0E        = "82576d"
+let g:base16_gui0E = "82576d"
 let s:gui0F        = "825757"
 let g:base16_gui0F = "825757"
 
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#16130F"
-  let g:terminal_color_1 =  "#826D57"
-  let g:terminal_color_2 =  "#57826D"
-  let g:terminal_color_3 =  "#6D8257"
-  let g:terminal_color_4 =  "#6D5782"
-  let g:terminal_color_5 =  "#82576D"
-  let g:terminal_color_6 =  "#576D82"
-  let g:terminal_color_7 =  "#A39A90"
-  let g:terminal_color_8 =  "#5A5047"
-  let g:terminal_color_9 =  "#826D57"
-  let g:terminal_color_10 = "#57826D"
-  let g:terminal_color_11 = "#6D8257"
-  let g:terminal_color_12 = "#6D5782"
-  let g:terminal_color_13 = "#82576D"
-  let g:terminal_color_14 = "#576D82"
-  let g:terminal_color_15 = "#DBD6D1"
+  let g:terminal_color_0 =  "#16130f"
+  let g:terminal_color_1 =  "#826d57"
+  let g:terminal_color_2 =  "#57826d"
+  let g:terminal_color_3 =  "#6d8257"
+  let g:terminal_color_4 =  "#6d5782"
+  let g:terminal_color_5 =  "#82576d"
+  let g:terminal_color_6 =  "#576d82"
+  let g:terminal_color_7 =  "#a39a90"
+  let g:terminal_color_8 =  "#5a5047"
+  let g:terminal_color_9 =  "#826d57"
+  let g:terminal_color_10 = "#57826d"
+  let g:terminal_color_11 = "#6d8257"
+  let g:terminal_color_12 = "#6d5782"
+  let g:terminal_color_13 = "#82576d"
+  let g:terminal_color_14 = "#576d82"
+  let g:terminal_color_15 = "#dbd6d1"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#16130F",
-        \ "#826D57",
-        \ "#57826D",
-        \ "#6D8257",
-        \ "#6D5782",
-        \ "#82576D",
-        \ "#576D82",
-        \ "#A39A90",
-        \ "#5A5047",
-        \ "#826D57",
-        \ "#57826D",
-        \ "#6D8257",
-        \ "#6D5782",
-        \ "#82576D",
-        \ "#576D82",
-        \ "#DBD6D1",
+        \ "#16130f",
+        \ "#826d57",
+        \ "#57826d",
+        \ "#6d8257",
+        \ "#6d5782",
+        \ "#82576d",
+        \ "#576d82",
+        \ "#a39a90",
+        \ "#5a5047",
+        \ "#826d57",
+        \ "#57826d",
+        \ "#6d8257",
+        \ "#6d5782",
+        \ "#82576d",
+        \ "#576d82",
+        \ "#dbd6d1",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-emil.vim b/colors/base16-emil.vim
new file mode 100644
index 0000000..ab27a21
--- /dev/null
+++ b/colors/base16-emil.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" emil scheme by limelier
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-emil.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "efefef"
+let g:base16_gui00 = "efefef"
+let s:gui01        = "bebed2"
+let g:base16_gui01 = "bebed2"
+let s:gui02        = "9e9eaf"
+let g:base16_gui02 = "9e9eaf"
+let s:gui03        = "7c7c98"
+let g:base16_gui03 = "7c7c98"
+let s:gui04        = "505063"
+let g:base16_gui04 = "505063"
+let s:gui05        = "313145"
+let g:base16_gui05 = "313145"
+let s:gui06        = "22223a"
+let g:base16_gui06 = "22223a"
+let s:gui07        = "1a1a2f"
+let g:base16_gui07 = "1a1a2f"
+let s:gui08        = "f43979"
+let g:base16_gui08 = "f43979"
+let s:gui09        = "d22a8b"
+let g:base16_gui09 = "d22a8b"
+let s:gui0A        = "ff669b"
+let g:base16_gui0A = "ff669b"
+let s:gui0B        = "0073a8"
+let g:base16_gui0B = "0073a8"
+let s:gui0C        = "2155d6"
+let g:base16_gui0C = "2155d6"
+let s:gui0D        = "471397"
+let g:base16_gui0D = "471397"
+let s:gui0E        = "6916b6"
+let g:base16_gui0E = "6916b6"
+let s:gui0F        = "8d17a5"
+let g:base16_gui0F = "8d17a5"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#efefef"
+  let g:terminal_color_1 =  "#f43979"
+  let g:terminal_color_2 =  "#0073a8"
+  let g:terminal_color_3 =  "#ff669b"
+  let g:terminal_color_4 =  "#471397"
+  let g:terminal_color_5 =  "#6916b6"
+  let g:terminal_color_6 =  "#2155d6"
+  let g:terminal_color_7 =  "#313145"
+  let g:terminal_color_8 =  "#7c7c98"
+  let g:terminal_color_9 =  "#f43979"
+  let g:terminal_color_10 = "#0073a8"
+  let g:terminal_color_11 = "#ff669b"
+  let g:terminal_color_12 = "#471397"
+  let g:terminal_color_13 = "#6916b6"
+  let g:terminal_color_14 = "#2155d6"
+  let g:terminal_color_15 = "#1a1a2f"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#efefef",
+        \ "#f43979",
+        \ "#0073a8",
+        \ "#ff669b",
+        \ "#471397",
+        \ "#6916b6",
+        \ "#2155d6",
+        \ "#313145",
+        \ "#7c7c98",
+        \ "#f43979",
+        \ "#0073a8",
+        \ "#ff669b",
+        \ "#471397",
+        \ "#6916b6",
+        \ "#2155d6",
+        \ "#1a1a2f",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-emil"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-equilibrium-dark.vim b/colors/base16-equilibrium-dark.vim
index a797415..8e9fc9c 100644
--- a/colors/base16-equilibrium-dark.vim
+++ b/colors/base16-equilibrium-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-equilibrium-gray-dark.vim b/colors/base16-equilibrium-gray-dark.vim
index f84cf07..ce80897 100644
--- a/colors/base16-equilibrium-gray-dark.vim
+++ b/colors/base16-equilibrium-gray-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-equilibrium-gray-light.vim b/colors/base16-equilibrium-gray-light.vim
index 9a9d747..d94e5ac 100644
--- a/colors/base16-equilibrium-gray-light.vim
+++ b/colors/base16-equilibrium-gray-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-equilibrium-light.vim b/colors/base16-equilibrium-light.vim
index 0449663..8a1869d 100644
--- a/colors/base16-equilibrium-light.vim
+++ b/colors/base16-equilibrium-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-espresso.vim b/colors/base16-espresso.vim
index 62bc30a..91987ca 100644
--- a/colors/base16-espresso.vim
+++ b/colors/base16-espresso.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-eva-dim.vim b/colors/base16-eva-dim.vim
index bcf7c45..1d55c65 100644
--- a/colors/base16-eva-dim.vim
+++ b/colors/base16-eva-dim.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-eva.vim b/colors/base16-eva.vim
index dda11e5..5789826 100644
--- a/colors/base16-eva.vim
+++ b/colors/base16-eva.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-everforest.vim b/colors/base16-everforest.vim
new file mode 100644
index 0000000..da6d79b
--- /dev/null
+++ b/colors/base16-everforest.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" EverForest scheme by sainnhe
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-everforest.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "2b3339"
+let g:base16_gui00 = "2b3339"
+let s:gui01        = "323c41"
+let g:base16_gui01 = "323c41"
+let s:gui02        = "3a4248"
+let g:base16_gui02 = "3a4248"
+let s:gui03        = "868d80"
+let g:base16_gui03 = "868d80"
+let s:gui04        = "a59572"
+let g:base16_gui04 = "a59572"
+let s:gui05        = "d3c6aa"
+let g:base16_gui05 = "d3c6aa"
+let s:gui06        = "e9e8d2"
+let g:base16_gui06 = "e9e8d2"
+let s:gui07        = "fff9e8"
+let g:base16_gui07 = "fff9e8"
+let s:gui08        = "e67e80"
+let g:base16_gui08 = "e67e80"
+let s:gui09        = "e69875"
+let g:base16_gui09 = "e69875"
+let s:gui0A        = "dbbc7f"
+let g:base16_gui0A = "dbbc7f"
+let s:gui0B        = "a7c080"
+let g:base16_gui0B = "a7c080"
+let s:gui0C        = "83c092"
+let g:base16_gui0C = "83c092"
+let s:gui0D        = "7fbbb3"
+let g:base16_gui0D = "7fbbb3"
+let s:gui0E        = "d699b6"
+let g:base16_gui0E = "d699b6"
+let s:gui0F        = "d699b6"
+let g:base16_gui0F = "d699b6"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2b3339"
+  let g:terminal_color_1 =  "#e67e80"
+  let g:terminal_color_2 =  "#a7c080"
+  let g:terminal_color_3 =  "#dbbc7f"
+  let g:terminal_color_4 =  "#7fbbb3"
+  let g:terminal_color_5 =  "#d699b6"
+  let g:terminal_color_6 =  "#83c092"
+  let g:terminal_color_7 =  "#d3c6aa"
+  let g:terminal_color_8 =  "#868d80"
+  let g:terminal_color_9 =  "#e67e80"
+  let g:terminal_color_10 = "#a7c080"
+  let g:terminal_color_11 = "#dbbc7f"
+  let g:terminal_color_12 = "#7fbbb3"
+  let g:terminal_color_13 = "#d699b6"
+  let g:terminal_color_14 = "#83c092"
+  let g:terminal_color_15 = "#fff9e8"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#2b3339",
+        \ "#e67e80",
+        \ "#a7c080",
+        \ "#dbbc7f",
+        \ "#7fbbb3",
+        \ "#d699b6",
+        \ "#83c092",
+        \ "#d3c6aa",
+        \ "#868d80",
+        \ "#e67e80",
+        \ "#a7c080",
+        \ "#dbbc7f",
+        \ "#7fbbb3",
+        \ "#d699b6",
+        \ "#83c092",
+        \ "#fff9e8",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-everforest"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index f698261..01a8767 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -15,36 +15,36 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "2C3E50"
-let g:base16_gui00 = "2C3E50"
-let s:gui01        = "34495E"
-let g:base16_gui01 = "34495E"
-let s:gui02        = "7F8C8D"
-let g:base16_gui02 = "7F8C8D"
-let s:gui03        = "95A5A6"
-let g:base16_gui03 = "95A5A6"
-let s:gui04        = "BDC3C7"
-let g:base16_gui04 = "BDC3C7"
+let s:gui00        = "2c3e50"
+let g:base16_gui00 = "2c3e50"
+let s:gui01        = "34495e"
+let g:base16_gui01 = "34495e"
+let s:gui02        = "7f8c8d"
+let g:base16_gui02 = "7f8c8d"
+let s:gui03        = "95a5a6"
+let g:base16_gui03 = "95a5a6"
+let s:gui04        = "bdc3c7"
+let g:base16_gui04 = "bdc3c7"
 let s:gui05        = "e0e0e0"
 let g:base16_gui05 = "e0e0e0"
 let s:gui06        = "f5f5f5"
 let g:base16_gui06 = "f5f5f5"
-let s:gui07        = "ECF0F1"
-let g:base16_gui07 = "ECF0F1"
-let s:gui08        = "E74C3C"
-let g:base16_gui08 = "E74C3C"
-let s:gui09        = "E67E22"
-let g:base16_gui09 = "E67E22"
-let s:gui0A        = "F1C40F"
-let g:base16_gui0A = "F1C40F"
-let s:gui0B        = "2ECC71"
-let g:base16_gui0B = "2ECC71"
-let s:gui0C        = "1ABC9C"
-let g:base16_gui0C = "1ABC9C"
-let s:gui0D        = "3498DB"
-let g:base16_gui0D = "3498DB"
-let s:gui0E        = "9B59B6"
-let g:base16_gui0E = "9B59B6"
+let s:gui07        = "ecf0f1"
+let g:base16_gui07 = "ecf0f1"
+let s:gui08        = "e74c3c"
+let g:base16_gui08 = "e74c3c"
+let s:gui09        = "e67e22"
+let g:base16_gui09 = "e67e22"
+let s:gui0A        = "f1c40f"
+let g:base16_gui0A = "f1c40f"
+let s:gui0B        = "2ecc71"
+let g:base16_gui0B = "2ecc71"
+let s:gui0C        = "1abc9c"
+let g:base16_gui0C = "1abc9c"
+let s:gui0D        = "3498db"
+let g:base16_gui0D = "3498db"
+let s:gui0E        = "9b59b6"
+let g:base16_gui0E = "9b59b6"
 let s:gui0F        = "be643c"
 let g:base16_gui0F = "be643c"
 
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#2C3E50"
-  let g:terminal_color_1 =  "#E74C3C"
-  let g:terminal_color_2 =  "#2ECC71"
-  let g:terminal_color_3 =  "#F1C40F"
-  let g:terminal_color_4 =  "#3498DB"
-  let g:terminal_color_5 =  "#9B59B6"
-  let g:terminal_color_6 =  "#1ABC9C"
+  let g:terminal_color_0 =  "#2c3e50"
+  let g:terminal_color_1 =  "#e74c3c"
+  let g:terminal_color_2 =  "#2ecc71"
+  let g:terminal_color_3 =  "#f1c40f"
+  let g:terminal_color_4 =  "#3498db"
+  let g:terminal_color_5 =  "#9b59b6"
+  let g:terminal_color_6 =  "#1abc9c"
   let g:terminal_color_7 =  "#e0e0e0"
-  let g:terminal_color_8 =  "#95A5A6"
-  let g:terminal_color_9 =  "#E74C3C"
-  let g:terminal_color_10 = "#2ECC71"
-  let g:terminal_color_11 = "#F1C40F"
-  let g:terminal_color_12 = "#3498DB"
-  let g:terminal_color_13 = "#9B59B6"
-  let g:terminal_color_14 = "#1ABC9C"
-  let g:terminal_color_15 = "#ECF0F1"
+  let g:terminal_color_8 =  "#95a5a6"
+  let g:terminal_color_9 =  "#e74c3c"
+  let g:terminal_color_10 = "#2ecc71"
+  let g:terminal_color_11 = "#f1c40f"
+  let g:terminal_color_12 = "#3498db"
+  let g:terminal_color_13 = "#9b59b6"
+  let g:terminal_color_14 = "#1abc9c"
+  let g:terminal_color_15 = "#ecf0f1"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#2C3E50",
-        \ "#E74C3C",
-        \ "#2ECC71",
-        \ "#F1C40F",
-        \ "#3498DB",
-        \ "#9B59B6",
-        \ "#1ABC9C",
+        \ "#2c3e50",
+        \ "#e74c3c",
+        \ "#2ecc71",
+        \ "#f1c40f",
+        \ "#3498db",
+        \ "#9b59b6",
+        \ "#1abc9c",
         \ "#e0e0e0",
-        \ "#95A5A6",
-        \ "#E74C3C",
-        \ "#2ECC71",
-        \ "#F1C40F",
-        \ "#3498DB",
-        \ "#9B59B6",
-        \ "#1ABC9C",
-        \ "#ECF0F1",
+        \ "#95a5a6",
+        \ "#e74c3c",
+        \ "#2ecc71",
+        \ "#f1c40f",
+        \ "#3498db",
+        \ "#9b59b6",
+        \ "#1abc9c",
+        \ "#ecf0f1",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-framer.vim b/colors/base16-framer.vim
index 64e8bc9..ff86fec 100644
--- a/colors/base16-framer.vim
+++ b/colors/base16-framer.vim
@@ -23,30 +23,30 @@ let s:gui02        = "464646"
 let g:base16_gui02 = "464646"
 let s:gui03        = "747474"
 let g:base16_gui03 = "747474"
-let s:gui04        = "B9B9B9"
-let g:base16_gui04 = "B9B9B9"
-let s:gui05        = "D0D0D0"
-let g:base16_gui05 = "D0D0D0"
-let s:gui06        = "E8E8E8"
-let g:base16_gui06 = "E8E8E8"
-let s:gui07        = "EEEEEE"
-let g:base16_gui07 = "EEEEEE"
-let s:gui08        = "FD886B"
-let g:base16_gui08 = "FD886B"
-let s:gui09        = "FC4769"
-let g:base16_gui09 = "FC4769"
-let s:gui0A        = "FECB6E"
-let g:base16_gui0A = "FECB6E"
-let s:gui0B        = "32CCDC"
-let g:base16_gui0B = "32CCDC"
-let s:gui0C        = "ACDDFD"
-let g:base16_gui0C = "ACDDFD"
-let s:gui0D        = "20BCFC"
-let g:base16_gui0D = "20BCFC"
-let s:gui0E        = "BA8CFC"
-let g:base16_gui0E = "BA8CFC"
-let s:gui0F        = "B15F4A"
-let g:base16_gui0F = "B15F4A"
+let s:gui04        = "b9b9b9"
+let g:base16_gui04 = "b9b9b9"
+let s:gui05        = "d0d0d0"
+let g:base16_gui05 = "d0d0d0"
+let s:gui06        = "e8e8e8"
+let g:base16_gui06 = "e8e8e8"
+let s:gui07        = "eeeeee"
+let g:base16_gui07 = "eeeeee"
+let s:gui08        = "fd886b"
+let g:base16_gui08 = "fd886b"
+let s:gui09        = "fc4769"
+let g:base16_gui09 = "fc4769"
+let s:gui0A        = "fecb6e"
+let g:base16_gui0A = "fecb6e"
+let s:gui0B        = "32ccdc"
+let g:base16_gui0B = "32ccdc"
+let s:gui0C        = "acddfd"
+let g:base16_gui0C = "acddfd"
+let s:gui0D        = "20bcfc"
+let g:base16_gui0D = "20bcfc"
+let s:gui0E        = "ba8cfc"
+let g:base16_gui0E = "ba8cfc"
+let s:gui0F        = "b15f4a"
+let g:base16_gui0F = "b15f4a"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#181818"
-  let g:terminal_color_1 =  "#FD886B"
-  let g:terminal_color_2 =  "#32CCDC"
-  let g:terminal_color_3 =  "#FECB6E"
-  let g:terminal_color_4 =  "#20BCFC"
-  let g:terminal_color_5 =  "#BA8CFC"
-  let g:terminal_color_6 =  "#ACDDFD"
-  let g:terminal_color_7 =  "#D0D0D0"
+  let g:terminal_color_1 =  "#fd886b"
+  let g:terminal_color_2 =  "#32ccdc"
+  let g:terminal_color_3 =  "#fecb6e"
+  let g:terminal_color_4 =  "#20bcfc"
+  let g:terminal_color_5 =  "#ba8cfc"
+  let g:terminal_color_6 =  "#acddfd"
+  let g:terminal_color_7 =  "#d0d0d0"
   let g:terminal_color_8 =  "#747474"
-  let g:terminal_color_9 =  "#FD886B"
-  let g:terminal_color_10 = "#32CCDC"
-  let g:terminal_color_11 = "#FECB6E"
-  let g:terminal_color_12 = "#20BCFC"
-  let g:terminal_color_13 = "#BA8CFC"
-  let g:terminal_color_14 = "#ACDDFD"
-  let g:terminal_color_15 = "#EEEEEE"
+  let g:terminal_color_9 =  "#fd886b"
+  let g:terminal_color_10 = "#32ccdc"
+  let g:terminal_color_11 = "#fecb6e"
+  let g:terminal_color_12 = "#20bcfc"
+  let g:terminal_color_13 = "#ba8cfc"
+  let g:terminal_color_14 = "#acddfd"
+  let g:terminal_color_15 = "#eeeeee"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#181818",
-        \ "#FD886B",
-        \ "#32CCDC",
-        \ "#FECB6E",
-        \ "#20BCFC",
-        \ "#BA8CFC",
-        \ "#ACDDFD",
-        \ "#D0D0D0",
+        \ "#fd886b",
+        \ "#32ccdc",
+        \ "#fecb6e",
+        \ "#20bcfc",
+        \ "#ba8cfc",
+        \ "#acddfd",
+        \ "#d0d0d0",
         \ "#747474",
-        \ "#FD886B",
-        \ "#32CCDC",
-        \ "#FECB6E",
-        \ "#20BCFC",
-        \ "#BA8CFC",
-        \ "#ACDDFD",
-        \ "#EEEEEE",
+        \ "#fd886b",
+        \ "#32ccdc",
+        \ "#fecb6e",
+        \ "#20bcfc",
+        \ "#ba8cfc",
+        \ "#acddfd",
+        \ "#eeeeee",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-fruit-soda.vim b/colors/base16-fruit-soda.vim
index 691e0c0..d567ef0 100644
--- a/colors/base16-fruit-soda.vim
+++ b/colors/base16-fruit-soda.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gigavolt.vim b/colors/base16-gigavolt.vim
index 2386e09..24632a2 100644
--- a/colors/base16-gigavolt.vim
+++ b/colors/base16-gigavolt.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-github.vim b/colors/base16-github.vim
index 5561a8b..925cd6e 100644
--- a/colors/base16-github.vim
+++ b/colors/base16-github.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim
index 8782188..d34aa3a 100644
--- a/colors/base16-google-dark.vim
+++ b/colors/base16-google-dark.vim
@@ -31,22 +31,22 @@ let s:gui06        = "e0e0e0"
 let g:base16_gui06 = "e0e0e0"
 let s:gui07        = "ffffff"
 let g:base16_gui07 = "ffffff"
-let s:gui08        = "CC342B"
-let g:base16_gui08 = "CC342B"
-let s:gui09        = "F96A38"
-let g:base16_gui09 = "F96A38"
-let s:gui0A        = "FBA922"
-let g:base16_gui0A = "FBA922"
+let s:gui08        = "cc342b"
+let g:base16_gui08 = "cc342b"
+let s:gui09        = "f96a38"
+let g:base16_gui09 = "f96a38"
+let s:gui0A        = "fba922"
+let g:base16_gui0A = "fba922"
 let s:gui0B        = "198844"
 let g:base16_gui0B = "198844"
-let s:gui0C        = "3971ED"
-let g:base16_gui0C = "3971ED"
-let s:gui0D        = "3971ED"
-let g:base16_gui0D = "3971ED"
-let s:gui0E        = "A36AC7"
-let g:base16_gui0E = "A36AC7"
-let s:gui0F        = "3971ED"
-let g:base16_gui0F = "3971ED"
+let s:gui0C        = "3971ed"
+let g:base16_gui0C = "3971ed"
+let s:gui0D        = "3971ed"
+let g:base16_gui0D = "3971ed"
+let s:gui0E        = "a36ac7"
+let g:base16_gui0E = "a36ac7"
+let s:gui0F        = "3971ed"
+let g:base16_gui0F = "3971ed"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,20 +100,20 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#1d1f21"
-  let g:terminal_color_1 =  "#CC342B"
+  let g:terminal_color_1 =  "#cc342b"
   let g:terminal_color_2 =  "#198844"
-  let g:terminal_color_3 =  "#FBA922"
-  let g:terminal_color_4 =  "#3971ED"
-  let g:terminal_color_5 =  "#A36AC7"
-  let g:terminal_color_6 =  "#3971ED"
+  let g:terminal_color_3 =  "#fba922"
+  let g:terminal_color_4 =  "#3971ed"
+  let g:terminal_color_5 =  "#a36ac7"
+  let g:terminal_color_6 =  "#3971ed"
   let g:terminal_color_7 =  "#c5c8c6"
   let g:terminal_color_8 =  "#969896"
-  let g:terminal_color_9 =  "#CC342B"
+  let g:terminal_color_9 =  "#cc342b"
   let g:terminal_color_10 = "#198844"
-  let g:terminal_color_11 = "#FBA922"
-  let g:terminal_color_12 = "#3971ED"
-  let g:terminal_color_13 = "#A36AC7"
-  let g:terminal_color_14 = "#3971ED"
+  let g:terminal_color_11 = "#fba922"
+  let g:terminal_color_12 = "#3971ed"
+  let g:terminal_color_13 = "#a36ac7"
+  let g:terminal_color_14 = "#3971ed"
   let g:terminal_color_15 = "#ffffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -124,20 +124,20 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#1d1f21",
-        \ "#CC342B",
+        \ "#cc342b",
         \ "#198844",
-        \ "#FBA922",
-        \ "#3971ED",
-        \ "#A36AC7",
-        \ "#3971ED",
+        \ "#fba922",
+        \ "#3971ed",
+        \ "#a36ac7",
+        \ "#3971ed",
         \ "#c5c8c6",
         \ "#969896",
-        \ "#CC342B",
+        \ "#cc342b",
         \ "#198844",
-        \ "#FBA922",
-        \ "#3971ED",
-        \ "#A36AC7",
-        \ "#3971ED",
+        \ "#fba922",
+        \ "#3971ed",
+        \ "#a36ac7",
+        \ "#3971ed",
         \ "#ffffff",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim
index 466577d..75101f5 100644
--- a/colors/base16-google-light.vim
+++ b/colors/base16-google-light.vim
@@ -31,22 +31,22 @@ let s:gui06        = "282a2e"
 let g:base16_gui06 = "282a2e"
 let s:gui07        = "1d1f21"
 let g:base16_gui07 = "1d1f21"
-let s:gui08        = "CC342B"
-let g:base16_gui08 = "CC342B"
-let s:gui09        = "F96A38"
-let g:base16_gui09 = "F96A38"
-let s:gui0A        = "FBA922"
-let g:base16_gui0A = "FBA922"
+let s:gui08        = "cc342b"
+let g:base16_gui08 = "cc342b"
+let s:gui09        = "f96a38"
+let g:base16_gui09 = "f96a38"
+let s:gui0A        = "fba922"
+let g:base16_gui0A = "fba922"
 let s:gui0B        = "198844"
 let g:base16_gui0B = "198844"
-let s:gui0C        = "3971ED"
-let g:base16_gui0C = "3971ED"
-let s:gui0D        = "3971ED"
-let g:base16_gui0D = "3971ED"
-let s:gui0E        = "A36AC7"
-let g:base16_gui0E = "A36AC7"
-let s:gui0F        = "3971ED"
-let g:base16_gui0F = "3971ED"
+let s:gui0C        = "3971ed"
+let g:base16_gui0C = "3971ed"
+let s:gui0D        = "3971ed"
+let g:base16_gui0D = "3971ed"
+let s:gui0E        = "a36ac7"
+let g:base16_gui0E = "a36ac7"
+let s:gui0F        = "3971ed"
+let g:base16_gui0F = "3971ed"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,20 +100,20 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#ffffff"
-  let g:terminal_color_1 =  "#CC342B"
+  let g:terminal_color_1 =  "#cc342b"
   let g:terminal_color_2 =  "#198844"
-  let g:terminal_color_3 =  "#FBA922"
-  let g:terminal_color_4 =  "#3971ED"
-  let g:terminal_color_5 =  "#A36AC7"
-  let g:terminal_color_6 =  "#3971ED"
+  let g:terminal_color_3 =  "#fba922"
+  let g:terminal_color_4 =  "#3971ed"
+  let g:terminal_color_5 =  "#a36ac7"
+  let g:terminal_color_6 =  "#3971ed"
   let g:terminal_color_7 =  "#373b41"
   let g:terminal_color_8 =  "#b4b7b4"
-  let g:terminal_color_9 =  "#CC342B"
+  let g:terminal_color_9 =  "#cc342b"
   let g:terminal_color_10 = "#198844"
-  let g:terminal_color_11 = "#FBA922"
-  let g:terminal_color_12 = "#3971ED"
-  let g:terminal_color_13 = "#A36AC7"
-  let g:terminal_color_14 = "#3971ED"
+  let g:terminal_color_11 = "#fba922"
+  let g:terminal_color_12 = "#3971ed"
+  let g:terminal_color_13 = "#a36ac7"
+  let g:terminal_color_14 = "#3971ed"
   let g:terminal_color_15 = "#1d1f21"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -124,20 +124,20 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#ffffff",
-        \ "#CC342B",
+        \ "#cc342b",
         \ "#198844",
-        \ "#FBA922",
-        \ "#3971ED",
-        \ "#A36AC7",
-        \ "#3971ED",
+        \ "#fba922",
+        \ "#3971ed",
+        \ "#a36ac7",
+        \ "#3971ed",
         \ "#373b41",
         \ "#b4b7b4",
-        \ "#CC342B",
+        \ "#cc342b",
         \ "#198844",
-        \ "#FBA922",
-        \ "#3971ED",
-        \ "#A36AC7",
-        \ "#3971ED",
+        \ "#fba922",
+        \ "#3971ed",
+        \ "#a36ac7",
+        \ "#3971ed",
         \ "#1d1f21",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gotham.vim b/colors/base16-gotham.vim
new file mode 100644
index 0000000..12ab88b
--- /dev/null
+++ b/colors/base16-gotham.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Gotham scheme by Andrea Leopardi (arranged by Brett Jones)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gotham.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "0c1014"
+let g:base16_gui00 = "0c1014"
+let s:gui01        = "11151c"
+let g:base16_gui01 = "11151c"
+let s:gui02        = "091f2e"
+let g:base16_gui02 = "091f2e"
+let s:gui03        = "0a3749"
+let g:base16_gui03 = "0a3749"
+let s:gui04        = "245361"
+let g:base16_gui04 = "245361"
+let s:gui05        = "599cab"
+let g:base16_gui05 = "599cab"
+let s:gui06        = "99d1ce"
+let g:base16_gui06 = "99d1ce"
+let s:gui07        = "d3ebe9"
+let g:base16_gui07 = "d3ebe9"
+let s:gui08        = "c23127"
+let g:base16_gui08 = "c23127"
+let s:gui09        = "d26937"
+let g:base16_gui09 = "d26937"
+let s:gui0A        = "edb443"
+let g:base16_gui0A = "edb443"
+let s:gui0B        = "33859e"
+let g:base16_gui0B = "33859e"
+let s:gui0C        = "2aa889"
+let g:base16_gui0C = "2aa889"
+let s:gui0D        = "195466"
+let g:base16_gui0D = "195466"
+let s:gui0E        = "888ca6"
+let g:base16_gui0E = "888ca6"
+let s:gui0F        = "4e5166"
+let g:base16_gui0F = "4e5166"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#0c1014"
+  let g:terminal_color_1 =  "#c23127"
+  let g:terminal_color_2 =  "#33859e"
+  let g:terminal_color_3 =  "#edb443"
+  let g:terminal_color_4 =  "#195466"
+  let g:terminal_color_5 =  "#888ca6"
+  let g:terminal_color_6 =  "#2aa889"
+  let g:terminal_color_7 =  "#599cab"
+  let g:terminal_color_8 =  "#0a3749"
+  let g:terminal_color_9 =  "#c23127"
+  let g:terminal_color_10 = "#33859e"
+  let g:terminal_color_11 = "#edb443"
+  let g:terminal_color_12 = "#195466"
+  let g:terminal_color_13 = "#888ca6"
+  let g:terminal_color_14 = "#2aa889"
+  let g:terminal_color_15 = "#d3ebe9"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#0c1014",
+        \ "#c23127",
+        \ "#33859e",
+        \ "#edb443",
+        \ "#195466",
+        \ "#888ca6",
+        \ "#2aa889",
+        \ "#599cab",
+        \ "#0a3749",
+        \ "#c23127",
+        \ "#33859e",
+        \ "#edb443",
+        \ "#195466",
+        \ "#888ca6",
+        \ "#2aa889",
+        \ "#d3ebe9",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-gotham"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim
index fd34565..8bfd14f 100644
--- a/colors/base16-grayscale-dark.vim
+++ b/colors/base16-grayscale-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim
index facada3..41a1939 100644
--- a/colors/base16-grayscale-light.vim
+++ b/colors/base16-grayscale-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index 2030468..e316936 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gruber.vim b/colors/base16-gruber.vim
new file mode 100644
index 0000000..fcc981a
--- /dev/null
+++ b/colors/base16-gruber.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Gruber scheme by Patel, Nimai &lt;nimai.m.patel@gmail.com&gt;, colors from www.github.com/rexim/gruber-darker-theme
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruber.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "181818"
+let g:base16_gui00 = "181818"
+let s:gui01        = "453d41"
+let g:base16_gui01 = "453d41"
+let s:gui02        = "484848"
+let g:base16_gui02 = "484848"
+let s:gui03        = "52494e"
+let g:base16_gui03 = "52494e"
+let s:gui04        = "e4e4ef"
+let g:base16_gui04 = "e4e4ef"
+let s:gui05        = "f4f4ff"
+let g:base16_gui05 = "f4f4ff"
+let s:gui06        = "f5f5f5"
+let g:base16_gui06 = "f5f5f5"
+let s:gui07        = "e4e4ef"
+let g:base16_gui07 = "e4e4ef"
+let s:gui08        = "f43841"
+let g:base16_gui08 = "f43841"
+let s:gui09        = "c73c3f"
+let g:base16_gui09 = "c73c3f"
+let s:gui0A        = "ffdd33"
+let g:base16_gui0A = "ffdd33"
+let s:gui0B        = "73c936"
+let g:base16_gui0B = "73c936"
+let s:gui0C        = "95a99f"
+let g:base16_gui0C = "95a99f"
+let s:gui0D        = "96a6c8"
+let g:base16_gui0D = "96a6c8"
+let s:gui0E        = "9e95c7"
+let g:base16_gui0E = "9e95c7"
+let s:gui0F        = "cc8c3c"
+let g:base16_gui0F = "cc8c3c"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#181818"
+  let g:terminal_color_1 =  "#f43841"
+  let g:terminal_color_2 =  "#73c936"
+  let g:terminal_color_3 =  "#ffdd33"
+  let g:terminal_color_4 =  "#96a6c8"
+  let g:terminal_color_5 =  "#9e95c7"
+  let g:terminal_color_6 =  "#95a99f"
+  let g:terminal_color_7 =  "#f4f4ff"
+  let g:terminal_color_8 =  "#52494e"
+  let g:terminal_color_9 =  "#f43841"
+  let g:terminal_color_10 = "#73c936"
+  let g:terminal_color_11 = "#ffdd33"
+  let g:terminal_color_12 = "#96a6c8"
+  let g:terminal_color_13 = "#9e95c7"
+  let g:terminal_color_14 = "#95a99f"
+  let g:terminal_color_15 = "#e4e4ef"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#181818",
+        \ "#f43841",
+        \ "#73c936",
+        \ "#ffdd33",
+        \ "#96a6c8",
+        \ "#9e95c7",
+        \ "#95a99f",
+        \ "#f4f4ff",
+        \ "#52494e",
+        \ "#f43841",
+        \ "#73c936",
+        \ "#ffdd33",
+        \ "#96a6c8",
+        \ "#9e95c7",
+        \ "#95a99f",
+        \ "#e4e4ef",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-gruber"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim
index 6f7792c..ceb2a4e 100644
--- a/colors/base16-gruvbox-dark-hard.vim
+++ b/colors/base16-gruvbox-dark-hard.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim
index ea3eec4..56d7c78 100644
--- a/colors/base16-gruvbox-dark-medium.vim
+++ b/colors/base16-gruvbox-dark-medium.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim
index bcea297..702737c 100644
--- a/colors/base16-gruvbox-dark-pale.vim
+++ b/colors/base16-gruvbox-dark-pale.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim
index 3c59656..aca0bf2 100644
--- a/colors/base16-gruvbox-dark-soft.vim
+++ b/colors/base16-gruvbox-dark-soft.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim
index 24fb39c..541631a 100644
--- a/colors/base16-gruvbox-light-hard.vim
+++ b/colors/base16-gruvbox-light-hard.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim
index bc7efb0..d1eba6f 100644
--- a/colors/base16-gruvbox-light-medium.vim
+++ b/colors/base16-gruvbox-light-medium.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim
index 6a7ecd0..551bc97 100644
--- a/colors/base16-gruvbox-light-soft.vim
+++ b/colors/base16-gruvbox-light-soft.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-gruvbox-material-dark-hard.vim b/colors/base16-gruvbox-material-dark-hard.vim
new file mode 100644
index 0000000..659dbba
--- /dev/null
+++ b/colors/base16-gruvbox-material-dark-hard.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Gruvbox Material Dark, Medium scheme by Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-material-dark-hard.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "202020"
+let g:base16_gui00 = "202020"
+let s:gui01        = "2a2827"
+let g:base16_gui01 = "2a2827"
+let s:gui02        = "504945"
+let g:base16_gui02 = "504945"
+let s:gui03        = "5a524c"
+let g:base16_gui03 = "5a524c"
+let s:gui04        = "bdae93"
+let g:base16_gui04 = "bdae93"
+let s:gui05        = "ddc7a1"
+let g:base16_gui05 = "ddc7a1"
+let s:gui06        = "ebdbb2"
+let g:base16_gui06 = "ebdbb2"
+let s:gui07        = "fbf1c7"
+let g:base16_gui07 = "fbf1c7"
+let s:gui08        = "ea6962"
+let g:base16_gui08 = "ea6962"
+let s:gui09        = "e78a4e"
+let g:base16_gui09 = "e78a4e"
+let s:gui0A        = "d8a657"
+let g:base16_gui0A = "d8a657"
+let s:gui0B        = "a9b665"
+let g:base16_gui0B = "a9b665"
+let s:gui0C        = "89b482"
+let g:base16_gui0C = "89b482"
+let s:gui0D        = "7daea3"
+let g:base16_gui0D = "7daea3"
+let s:gui0E        = "d3869b"
+let g:base16_gui0E = "d3869b"
+let s:gui0F        = "bd6f3e"
+let g:base16_gui0F = "bd6f3e"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#202020"
+  let g:terminal_color_1 =  "#ea6962"
+  let g:terminal_color_2 =  "#a9b665"
+  let g:terminal_color_3 =  "#d8a657"
+  let g:terminal_color_4 =  "#7daea3"
+  let g:terminal_color_5 =  "#d3869b"
+  let g:terminal_color_6 =  "#89b482"
+  let g:terminal_color_7 =  "#ddc7a1"
+  let g:terminal_color_8 =  "#5a524c"
+  let g:terminal_color_9 =  "#ea6962"
+  let g:terminal_color_10 = "#a9b665"
+  let g:terminal_color_11 = "#d8a657"
+  let g:terminal_color_12 = "#7daea3"
+  let g:terminal_color_13 = "#d3869b"
+  let g:terminal_color_14 = "#89b482"
+  let g:terminal_color_15 = "#fbf1c7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#202020",
+        \ "#ea6962",
+        \ "#a9b665",
+        \ "#d8a657",
+        \ "#7daea3",
+        \ "#d3869b",
+        \ "#89b482",
+        \ "#ddc7a1",
+        \ "#5a524c",
+        \ "#ea6962",
+        \ "#a9b665",
+        \ "#d8a657",
+        \ "#7daea3",
+        \ "#d3869b",
+        \ "#89b482",
+        \ "#fbf1c7",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-gruvbox-material-dark-hard"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-gruvbox-material-dark-medium.vim b/colors/base16-gruvbox-material-dark-medium.vim
new file mode 100644
index 0000000..a5f5dbd
--- /dev/null
+++ b/colors/base16-gruvbox-material-dark-medium.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Gruvbox Material Dark, Medium scheme by Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-material-dark-medium.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "292828"
+let g:base16_gui00 = "292828"
+let s:gui01        = "32302f"
+let g:base16_gui01 = "32302f"
+let s:gui02        = "504945"
+let g:base16_gui02 = "504945"
+let s:gui03        = "665c54"
+let g:base16_gui03 = "665c54"
+let s:gui04        = "bdae93"
+let g:base16_gui04 = "bdae93"
+let s:gui05        = "ddc7a1"
+let g:base16_gui05 = "ddc7a1"
+let s:gui06        = "ebdbb2"
+let g:base16_gui06 = "ebdbb2"
+let s:gui07        = "fbf1c7"
+let g:base16_gui07 = "fbf1c7"
+let s:gui08        = "ea6962"
+let g:base16_gui08 = "ea6962"
+let s:gui09        = "e78a4e"
+let g:base16_gui09 = "e78a4e"
+let s:gui0A        = "d8a657"
+let g:base16_gui0A = "d8a657"
+let s:gui0B        = "a9b665"
+let g:base16_gui0B = "a9b665"
+let s:gui0C        = "89b482"
+let g:base16_gui0C = "89b482"
+let s:gui0D        = "7daea3"
+let g:base16_gui0D = "7daea3"
+let s:gui0E        = "d3869b"
+let g:base16_gui0E = "d3869b"
+let s:gui0F        = "bd6f3e"
+let g:base16_gui0F = "bd6f3e"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#292828"
+  let g:terminal_color_1 =  "#ea6962"
+  let g:terminal_color_2 =  "#a9b665"
+  let g:terminal_color_3 =  "#d8a657"
+  let g:terminal_color_4 =  "#7daea3"
+  let g:terminal_color_5 =  "#d3869b"
+  let g:terminal_color_6 =  "#89b482"
+  let g:terminal_color_7 =  "#ddc7a1"
+  let g:terminal_color_8 =  "#665c54"
+  let g:terminal_color_9 =  "#ea6962"
+  let g:terminal_color_10 = "#a9b665"
+  let g:terminal_color_11 = "#d8a657"
+  let g:terminal_color_12 = "#7daea3"
+  let g:terminal_color_13 = "#d3869b"
+  let g:terminal_color_14 = "#89b482"
+  let g:terminal_color_15 = "#fbf1c7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#292828",
+        \ "#ea6962",
+        \ "#a9b665",
+        \ "#d8a657",
+        \ "#7daea3",
+        \ "#d3869b",
+        \ "#89b482",
+        \ "#ddc7a1",
+        \ "#665c54",
+        \ "#ea6962",
+        \ "#a9b665",
+        \ "#d8a657",
+        \ "#7daea3",
+        \ "#d3869b",
+        \ "#89b482",
+        \ "#fbf1c7",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-gruvbox-material-dark-medium"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-gruvbox-material-dark-soft.vim b/colors/base16-gruvbox-material-dark-soft.vim
new file mode 100644
index 0000000..27cd51b
--- /dev/null
+++ b/colors/base16-gruvbox-material-dark-soft.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Gruvbox Material Dark, Soft scheme by Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-material-dark-soft.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "32302f"
+let g:base16_gui00 = "32302f"
+let s:gui01        = "3c3836"
+let g:base16_gui01 = "3c3836"
+let s:gui02        = "5a524c"
+let g:base16_gui02 = "5a524c"
+let s:gui03        = "7c6f64"
+let g:base16_gui03 = "7c6f64"
+let s:gui04        = "bdae93"
+let g:base16_gui04 = "bdae93"
+let s:gui05        = "ddc7a1"
+let g:base16_gui05 = "ddc7a1"
+let s:gui06        = "ebdbb2"
+let g:base16_gui06 = "ebdbb2"
+let s:gui07        = "fbf1c7"
+let g:base16_gui07 = "fbf1c7"
+let s:gui08        = "ea6962"
+let g:base16_gui08 = "ea6962"
+let s:gui09        = "e78a4e"
+let g:base16_gui09 = "e78a4e"
+let s:gui0A        = "d8a657"
+let g:base16_gui0A = "d8a657"
+let s:gui0B        = "a9b665"
+let g:base16_gui0B = "a9b665"
+let s:gui0C        = "89b482"
+let g:base16_gui0C = "89b482"
+let s:gui0D        = "7daea3"
+let g:base16_gui0D = "7daea3"
+let s:gui0E        = "d3869b"
+let g:base16_gui0E = "d3869b"
+let s:gui0F        = "bd6f3e"
+let g:base16_gui0F = "bd6f3e"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#32302f"
+  let g:terminal_color_1 =  "#ea6962"
+  let g:terminal_color_2 =  "#a9b665"
+  let g:terminal_color_3 =  "#d8a657"
+  let g:terminal_color_4 =  "#7daea3"
+  let g:terminal_color_5 =  "#d3869b"
+  let g:terminal_color_6 =  "#89b482"
+  let g:terminal_color_7 =  "#ddc7a1"
+  let g:terminal_color_8 =  "#7c6f64"
+  let g:terminal_color_9 =  "#ea6962"
+  let g:terminal_color_10 = "#a9b665"
+  let g:terminal_color_11 = "#d8a657"
+  let g:terminal_color_12 = "#7daea3"
+  let g:terminal_color_13 = "#d3869b"
+  let g:terminal_color_14 = "#89b482"
+  let g:terminal_color_15 = "#fbf1c7"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#32302f",
+        \ "#ea6962",
+        \ "#a9b665",
+        \ "#d8a657",
+        \ "#7daea3",
+        \ "#d3869b",
+        \ "#89b482",
+        \ "#ddc7a1",
+        \ "#7c6f64",
+        \ "#ea6962",
+        \ "#a9b665",
+        \ "#d8a657",
+        \ "#7daea3",
+        \ "#d3869b",
+        \ "#89b482",
+        \ "#fbf1c7",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-gruvbox-material-dark-soft"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-gruvbox-material-light-hard.vim b/colors/base16-gruvbox-material-light-hard.vim
new file mode 100644
index 0000000..a507808
--- /dev/null
+++ b/colors/base16-gruvbox-material-light-hard.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Gruvbox Material Light, Hard scheme by Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-material-light-hard.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "f9f5d7"
+let g:base16_gui00 = "f9f5d7"
+let s:gui01        = "fbf1c7"
+let g:base16_gui01 = "fbf1c7"
+let s:gui02        = "e0cfa9"
+let g:base16_gui02 = "e0cfa9"
+let s:gui03        = "a89984"
+let g:base16_gui03 = "a89984"
+let s:gui04        = "c9b99a"
+let g:base16_gui04 = "c9b99a"
+let s:gui05        = "654735"
+let g:base16_gui05 = "654735"
+let s:gui06        = "3c3836"
+let g:base16_gui06 = "3c3836"
+let s:gui07        = "282828"
+let g:base16_gui07 = "282828"
+let s:gui08        = "c14a4a"
+let g:base16_gui08 = "c14a4a"
+let s:gui09        = "c35e0a"
+let g:base16_gui09 = "c35e0a"
+let s:gui0A        = "b47109"
+let g:base16_gui0A = "b47109"
+let s:gui0B        = "6c782e"
+let g:base16_gui0B = "6c782e"
+let s:gui0C        = "4c7a5d"
+let g:base16_gui0C = "4c7a5d"
+let s:gui0D        = "45707a"
+let g:base16_gui0D = "45707a"
+let s:gui0E        = "945e80"
+let g:base16_gui0E = "945e80"
+let s:gui0F        = "e78a4e"
+let g:base16_gui0F = "e78a4e"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f9f5d7"
+  let g:terminal_color_1 =  "#c14a4a"
+  let g:terminal_color_2 =  "#6c782e"
+  let g:terminal_color_3 =  "#b47109"
+  let g:terminal_color_4 =  "#45707a"
+  let g:terminal_color_5 =  "#945e80"
+  let g:terminal_color_6 =  "#4c7a5d"
+  let g:terminal_color_7 =  "#654735"
+  let g:terminal_color_8 =  "#a89984"
+  let g:terminal_color_9 =  "#c14a4a"
+  let g:terminal_color_10 = "#6c782e"
+  let g:terminal_color_11 = "#b47109"
+  let g:terminal_color_12 = "#45707a"
+  let g:terminal_color_13 = "#945e80"
+  let g:terminal_color_14 = "#4c7a5d"
+  let g:terminal_color_15 = "#282828"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#f9f5d7",
+        \ "#c14a4a",
+        \ "#6c782e",
+        \ "#b47109",
+        \ "#45707a",
+        \ "#945e80",
+        \ "#4c7a5d",
+        \ "#654735",
+        \ "#a89984",
+        \ "#c14a4a",
+        \ "#6c782e",
+        \ "#b47109",
+        \ "#45707a",
+        \ "#945e80",
+        \ "#4c7a5d",
+        \ "#282828",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-gruvbox-material-light-hard"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-gruvbox-material-light-medium.vim b/colors/base16-gruvbox-material-light-medium.vim
new file mode 100644
index 0000000..60cb151
--- /dev/null
+++ b/colors/base16-gruvbox-material-light-medium.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Gruvbox Material Light, Medium scheme by Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-material-light-medium.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "fbf1c7"
+let g:base16_gui00 = "fbf1c7"
+let s:gui01        = "f2e5bc"
+let g:base16_gui01 = "f2e5bc"
+let s:gui02        = "d5c4a1"
+let g:base16_gui02 = "d5c4a1"
+let s:gui03        = "bdae93"
+let g:base16_gui03 = "bdae93"
+let s:gui04        = "665c54"
+let g:base16_gui04 = "665c54"
+let s:gui05        = "654735"
+let g:base16_gui05 = "654735"
+let s:gui06        = "3c3836"
+let g:base16_gui06 = "3c3836"
+let s:gui07        = "282828"
+let g:base16_gui07 = "282828"
+let s:gui08        = "c14a4a"
+let g:base16_gui08 = "c14a4a"
+let s:gui09        = "c35e0a"
+let g:base16_gui09 = "c35e0a"
+let s:gui0A        = "b47109"
+let g:base16_gui0A = "b47109"
+let s:gui0B        = "6c782e"
+let g:base16_gui0B = "6c782e"
+let s:gui0C        = "4c7a5d"
+let g:base16_gui0C = "4c7a5d"
+let s:gui0D        = "45707a"
+let g:base16_gui0D = "45707a"
+let s:gui0E        = "945e80"
+let g:base16_gui0E = "945e80"
+let s:gui0F        = "e78a4e"
+let g:base16_gui0F = "e78a4e"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#fbf1c7"
+  let g:terminal_color_1 =  "#c14a4a"
+  let g:terminal_color_2 =  "#6c782e"
+  let g:terminal_color_3 =  "#b47109"
+  let g:terminal_color_4 =  "#45707a"
+  let g:terminal_color_5 =  "#945e80"
+  let g:terminal_color_6 =  "#4c7a5d"
+  let g:terminal_color_7 =  "#654735"
+  let g:terminal_color_8 =  "#bdae93"
+  let g:terminal_color_9 =  "#c14a4a"
+  let g:terminal_color_10 = "#6c782e"
+  let g:terminal_color_11 = "#b47109"
+  let g:terminal_color_12 = "#45707a"
+  let g:terminal_color_13 = "#945e80"
+  let g:terminal_color_14 = "#4c7a5d"
+  let g:terminal_color_15 = "#282828"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#fbf1c7",
+        \ "#c14a4a",
+        \ "#6c782e",
+        \ "#b47109",
+        \ "#45707a",
+        \ "#945e80",
+        \ "#4c7a5d",
+        \ "#654735",
+        \ "#bdae93",
+        \ "#c14a4a",
+        \ "#6c782e",
+        \ "#b47109",
+        \ "#45707a",
+        \ "#945e80",
+        \ "#4c7a5d",
+        \ "#282828",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-gruvbox-material-light-medium"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-gruvbox-material-light-soft.vim b/colors/base16-gruvbox-material-light-soft.vim
new file mode 100644
index 0000000..9d00c13
--- /dev/null
+++ b/colors/base16-gruvbox-material-light-soft.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Gruvbox Material Light, Soft scheme by Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-gruvbox-material-light-soft.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "f2e5bc"
+let g:base16_gui00 = "f2e5bc"
+let s:gui01        = "ebdbb2"
+let g:base16_gui01 = "ebdbb2"
+let s:gui02        = "c9b99a"
+let g:base16_gui02 = "c9b99a"
+let s:gui03        = "a89984"
+let g:base16_gui03 = "a89984"
+let s:gui04        = "665c54"
+let g:base16_gui04 = "665c54"
+let s:gui05        = "654735"
+let g:base16_gui05 = "654735"
+let s:gui06        = "3c3836"
+let g:base16_gui06 = "3c3836"
+let s:gui07        = "282828"
+let g:base16_gui07 = "282828"
+let s:gui08        = "c14a4a"
+let g:base16_gui08 = "c14a4a"
+let s:gui09        = "c35e0a"
+let g:base16_gui09 = "c35e0a"
+let s:gui0A        = "b47109"
+let g:base16_gui0A = "b47109"
+let s:gui0B        = "6c782e"
+let g:base16_gui0B = "6c782e"
+let s:gui0C        = "4c7a5d"
+let g:base16_gui0C = "4c7a5d"
+let s:gui0D        = "45707a"
+let g:base16_gui0D = "45707a"
+let s:gui0E        = "945e80"
+let g:base16_gui0E = "945e80"
+let s:gui0F        = "e78a4e"
+let g:base16_gui0F = "e78a4e"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f2e5bc"
+  let g:terminal_color_1 =  "#c14a4a"
+  let g:terminal_color_2 =  "#6c782e"
+  let g:terminal_color_3 =  "#b47109"
+  let g:terminal_color_4 =  "#45707a"
+  let g:terminal_color_5 =  "#945e80"
+  let g:terminal_color_6 =  "#4c7a5d"
+  let g:terminal_color_7 =  "#654735"
+  let g:terminal_color_8 =  "#a89984"
+  let g:terminal_color_9 =  "#c14a4a"
+  let g:terminal_color_10 = "#6c782e"
+  let g:terminal_color_11 = "#b47109"
+  let g:terminal_color_12 = "#45707a"
+  let g:terminal_color_13 = "#945e80"
+  let g:terminal_color_14 = "#4c7a5d"
+  let g:terminal_color_15 = "#282828"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#f2e5bc",
+        \ "#c14a4a",
+        \ "#6c782e",
+        \ "#b47109",
+        \ "#45707a",
+        \ "#945e80",
+        \ "#4c7a5d",
+        \ "#654735",
+        \ "#a89984",
+        \ "#c14a4a",
+        \ "#6c782e",
+        \ "#b47109",
+        \ "#45707a",
+        \ "#945e80",
+        \ "#4c7a5d",
+        \ "#282828",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-gruvbox-material-light-soft"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-hardcore.vim b/colors/base16-hardcore.vim
index 9905714..0f836c5 100644
--- a/colors/base16-hardcore.vim
+++ b/colors/base16-hardcore.vim
@@ -21,8 +21,8 @@ let s:gui01        = "303030"
 let g:base16_gui01 = "303030"
 let s:gui02        = "353535"
 let g:base16_gui02 = "353535"
-let s:gui03        = "4A4A4A"
-let g:base16_gui03 = "4A4A4A"
+let s:gui03        = "4a4a4a"
+let g:base16_gui03 = "4a4a4a"
 let s:gui04        = "707070"
 let g:base16_gui04 = "707070"
 let s:gui05        = "cdcdcd"
@@ -107,7 +107,7 @@ if has("nvim")
   let g:terminal_color_5 =  "#9e6ffe"
   let g:terminal_color_6 =  "#708387"
   let g:terminal_color_7 =  "#cdcdcd"
-  let g:terminal_color_8 =  "#4A4A4A"
+  let g:terminal_color_8 =  "#4a4a4a"
   let g:terminal_color_9 =  "#f92672"
   let g:terminal_color_10 = "#a6e22e"
   let g:terminal_color_11 = "#e6db74"
@@ -131,7 +131,7 @@ elseif has("terminal")
         \ "#9e6ffe",
         \ "#708387",
         \ "#cdcdcd",
-        \ "#4A4A4A",
+        \ "#4a4a4a",
         \ "#f92672",
         \ "#a6e22e",
         \ "#e6db74",
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim
index 81c5a5d..b5969c5 100644
--- a/colors/base16-harmonic-dark.vim
+++ b/colors/base16-harmonic-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim
index 77f4e69..357994a 100644
--- a/colors/base16-harmonic-light.vim
+++ b/colors/base16-harmonic-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-heetch-light.vim b/colors/base16-heetch-light.vim
index 5daf205..859b200 100644
--- a/colors/base16-heetch-light.vim
+++ b/colors/base16-heetch-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-heetch.vim b/colors/base16-heetch.vim
index 23ba0ce..a22c159 100644
--- a/colors/base16-heetch.vim
+++ b/colors/base16-heetch.vim
@@ -19,32 +19,32 @@ let s:gui00        = "190134"
 let g:base16_gui00 = "190134"
 let s:gui01        = "392551"
 let g:base16_gui01 = "392551"
-let s:gui02        = "5A496E"
-let g:base16_gui02 = "5A496E"
-let s:gui03        = "7B6D8B"
-let g:base16_gui03 = "7B6D8B"
-let s:gui04        = "9C92A8"
-let g:base16_gui04 = "9C92A8"
-let s:gui05        = "BDB6C5"
-let g:base16_gui05 = "BDB6C5"
-let s:gui06        = "DEDAE2"
-let g:base16_gui06 = "DEDAE2"
-let s:gui07        = "FEFFFF"
-let g:base16_gui07 = "FEFFFF"
-let s:gui08        = "27D9D5"
-let g:base16_gui08 = "27D9D5"
-let s:gui09        = "5BA2B6"
-let g:base16_gui09 = "5BA2B6"
-let s:gui0A        = "8F6C97"
-let g:base16_gui0A = "8F6C97"
-let s:gui0B        = "C33678"
-let g:base16_gui0B = "C33678"
-let s:gui0C        = "F80059"
-let g:base16_gui0C = "F80059"
-let s:gui0D        = "BD0152"
-let g:base16_gui0D = "BD0152"
-let s:gui0E        = "82034C"
-let g:base16_gui0E = "82034C"
+let s:gui02        = "5a496e"
+let g:base16_gui02 = "5a496e"
+let s:gui03        = "7b6d8b"
+let g:base16_gui03 = "7b6d8b"
+let s:gui04        = "9c92a8"
+let g:base16_gui04 = "9c92a8"
+let s:gui05        = "bdb6c5"
+let g:base16_gui05 = "bdb6c5"
+let s:gui06        = "dedae2"
+let g:base16_gui06 = "dedae2"
+let s:gui07        = "feffff"
+let g:base16_gui07 = "feffff"
+let s:gui08        = "27d9d5"
+let g:base16_gui08 = "27d9d5"
+let s:gui09        = "5ba2b6"
+let g:base16_gui09 = "5ba2b6"
+let s:gui0A        = "8f6c97"
+let g:base16_gui0A = "8f6c97"
+let s:gui0B        = "c33678"
+let g:base16_gui0B = "c33678"
+let s:gui0C        = "f80059"
+let g:base16_gui0C = "f80059"
+let s:gui0D        = "bd0152"
+let g:base16_gui0D = "bd0152"
+let s:gui0E        = "82034c"
+let g:base16_gui0E = "82034c"
 let s:gui0F        = "470546"
 let g:base16_gui0F = "470546"
 
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#190134"
-  let g:terminal_color_1 =  "#27D9D5"
-  let g:terminal_color_2 =  "#C33678"
-  let g:terminal_color_3 =  "#8F6C97"
-  let g:terminal_color_4 =  "#BD0152"
-  let g:terminal_color_5 =  "#82034C"
-  let g:terminal_color_6 =  "#F80059"
-  let g:terminal_color_7 =  "#BDB6C5"
-  let g:terminal_color_8 =  "#7B6D8B"
-  let g:terminal_color_9 =  "#27D9D5"
-  let g:terminal_color_10 = "#C33678"
-  let g:terminal_color_11 = "#8F6C97"
-  let g:terminal_color_12 = "#BD0152"
-  let g:terminal_color_13 = "#82034C"
-  let g:terminal_color_14 = "#F80059"
-  let g:terminal_color_15 = "#FEFFFF"
+  let g:terminal_color_1 =  "#27d9d5"
+  let g:terminal_color_2 =  "#c33678"
+  let g:terminal_color_3 =  "#8f6c97"
+  let g:terminal_color_4 =  "#bd0152"
+  let g:terminal_color_5 =  "#82034c"
+  let g:terminal_color_6 =  "#f80059"
+  let g:terminal_color_7 =  "#bdb6c5"
+  let g:terminal_color_8 =  "#7b6d8b"
+  let g:terminal_color_9 =  "#27d9d5"
+  let g:terminal_color_10 = "#c33678"
+  let g:terminal_color_11 = "#8f6c97"
+  let g:terminal_color_12 = "#bd0152"
+  let g:terminal_color_13 = "#82034c"
+  let g:terminal_color_14 = "#f80059"
+  let g:terminal_color_15 = "#feffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#190134",
-        \ "#27D9D5",
-        \ "#C33678",
-        \ "#8F6C97",
-        \ "#BD0152",
-        \ "#82034C",
-        \ "#F80059",
-        \ "#BDB6C5",
-        \ "#7B6D8B",
-        \ "#27D9D5",
-        \ "#C33678",
-        \ "#8F6C97",
-        \ "#BD0152",
-        \ "#82034C",
-        \ "#F80059",
-        \ "#FEFFFF",
+        \ "#27d9d5",
+        \ "#c33678",
+        \ "#8f6c97",
+        \ "#bd0152",
+        \ "#82034c",
+        \ "#f80059",
+        \ "#bdb6c5",
+        \ "#7b6d8b",
+        \ "#27d9d5",
+        \ "#c33678",
+        \ "#8f6c97",
+        \ "#bd0152",
+        \ "#82034c",
+        \ "#f80059",
+        \ "#feffff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-helios.vim b/colors/base16-helios.vim
index 58fd08e..47e9ee8 100644
--- a/colors/base16-helios.vim
+++ b/colors/base16-helios.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim
index a51dbe6..005498a 100644
--- a/colors/base16-hopscotch.vim
+++ b/colors/base16-hopscotch.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-horizon-dark.vim b/colors/base16-horizon-dark.vim
index 0f1c527..66a4e4c 100644
--- a/colors/base16-horizon-dark.vim
+++ b/colors/base16-horizon-dark.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "1C1E26"
-let g:base16_gui00 = "1C1E26"
+let s:gui00        = "1c1e26"
+let g:base16_gui00 = "1c1e26"
 let s:gui01        = "232530"
 let g:base16_gui01 = "232530"
-let s:gui02        = "2E303E"
-let g:base16_gui02 = "2E303E"
-let s:gui03        = "6F6F70"
-let g:base16_gui03 = "6F6F70"
-let s:gui04        = "9DA0A2"
-let g:base16_gui04 = "9DA0A2"
-let s:gui05        = "CBCED0"
-let g:base16_gui05 = "CBCED0"
-let s:gui06        = "DCDFE4"
-let g:base16_gui06 = "DCDFE4"
-let s:gui07        = "E3E6EE"
-let g:base16_gui07 = "E3E6EE"
-let s:gui08        = "E93C58"
-let g:base16_gui08 = "E93C58"
-let s:gui09        = "E58D7D"
-let g:base16_gui09 = "E58D7D"
-let s:gui0A        = "EFB993"
-let g:base16_gui0A = "EFB993"
-let s:gui0B        = "EFAF8E"
-let g:base16_gui0B = "EFAF8E"
-let s:gui0C        = "24A8B4"
-let g:base16_gui0C = "24A8B4"
-let s:gui0D        = "DF5273"
-let g:base16_gui0D = "DF5273"
-let s:gui0E        = "B072D1"
-let g:base16_gui0E = "B072D1"
-let s:gui0F        = "E4A382"
-let g:base16_gui0F = "E4A382"
+let s:gui02        = "2e303e"
+let g:base16_gui02 = "2e303e"
+let s:gui03        = "6f6f70"
+let g:base16_gui03 = "6f6f70"
+let s:gui04        = "9da0a2"
+let g:base16_gui04 = "9da0a2"
+let s:gui05        = "cbced0"
+let g:base16_gui05 = "cbced0"
+let s:gui06        = "dcdfe4"
+let g:base16_gui06 = "dcdfe4"
+let s:gui07        = "e3e6ee"
+let g:base16_gui07 = "e3e6ee"
+let s:gui08        = "e93c58"
+let g:base16_gui08 = "e93c58"
+let s:gui09        = "e58d7d"
+let g:base16_gui09 = "e58d7d"
+let s:gui0A        = "efb993"
+let g:base16_gui0A = "efb993"
+let s:gui0B        = "efaf8e"
+let g:base16_gui0B = "efaf8e"
+let s:gui0C        = "24a8b4"
+let g:base16_gui0C = "24a8b4"
+let s:gui0D        = "df5273"
+let g:base16_gui0D = "df5273"
+let s:gui0E        = "b072d1"
+let g:base16_gui0E = "b072d1"
+let s:gui0F        = "e4a382"
+let g:base16_gui0F = "e4a382"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#1C1E26"
-  let g:terminal_color_1 =  "#E93C58"
-  let g:terminal_color_2 =  "#EFAF8E"
-  let g:terminal_color_3 =  "#EFB993"
-  let g:terminal_color_4 =  "#DF5273"
-  let g:terminal_color_5 =  "#B072D1"
-  let g:terminal_color_6 =  "#24A8B4"
-  let g:terminal_color_7 =  "#CBCED0"
-  let g:terminal_color_8 =  "#6F6F70"
-  let g:terminal_color_9 =  "#E93C58"
-  let g:terminal_color_10 = "#EFAF8E"
-  let g:terminal_color_11 = "#EFB993"
-  let g:terminal_color_12 = "#DF5273"
-  let g:terminal_color_13 = "#B072D1"
-  let g:terminal_color_14 = "#24A8B4"
-  let g:terminal_color_15 = "#E3E6EE"
+  let g:terminal_color_0 =  "#1c1e26"
+  let g:terminal_color_1 =  "#e93c58"
+  let g:terminal_color_2 =  "#efaf8e"
+  let g:terminal_color_3 =  "#efb993"
+  let g:terminal_color_4 =  "#df5273"
+  let g:terminal_color_5 =  "#b072d1"
+  let g:terminal_color_6 =  "#24a8b4"
+  let g:terminal_color_7 =  "#cbced0"
+  let g:terminal_color_8 =  "#6f6f70"
+  let g:terminal_color_9 =  "#e93c58"
+  let g:terminal_color_10 = "#efaf8e"
+  let g:terminal_color_11 = "#efb993"
+  let g:terminal_color_12 = "#df5273"
+  let g:terminal_color_13 = "#b072d1"
+  let g:terminal_color_14 = "#24a8b4"
+  let g:terminal_color_15 = "#e3e6ee"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#1C1E26",
-        \ "#E93C58",
-        \ "#EFAF8E",
-        \ "#EFB993",
-        \ "#DF5273",
-        \ "#B072D1",
-        \ "#24A8B4",
-        \ "#CBCED0",
-        \ "#6F6F70",
-        \ "#E93C58",
-        \ "#EFAF8E",
-        \ "#EFB993",
-        \ "#DF5273",
-        \ "#B072D1",
-        \ "#24A8B4",
-        \ "#E3E6EE",
+        \ "#1c1e26",
+        \ "#e93c58",
+        \ "#efaf8e",
+        \ "#efb993",
+        \ "#df5273",
+        \ "#b072d1",
+        \ "#24a8b4",
+        \ "#cbced0",
+        \ "#6f6f70",
+        \ "#e93c58",
+        \ "#efaf8e",
+        \ "#efb993",
+        \ "#df5273",
+        \ "#b072d1",
+        \ "#24a8b4",
+        \ "#e3e6ee",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-horizon-light.vim b/colors/base16-horizon-light.vim
index 62df9f2..0d9961b 100644
--- a/colors/base16-horizon-light.vim
+++ b/colors/base16-horizon-light.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "FDF0ED"
-let g:base16_gui00 = "FDF0ED"
-let s:gui01        = "FADAD1"
-let g:base16_gui01 = "FADAD1"
-let s:gui02        = "F9CBBE"
-let g:base16_gui02 = "F9CBBE"
-let s:gui03        = "BDB3B1"
-let g:base16_gui03 = "BDB3B1"
-let s:gui04        = "948C8A"
-let g:base16_gui04 = "948C8A"
-let s:gui05        = "403C3D"
-let g:base16_gui05 = "403C3D"
-let s:gui06        = "302C2D"
-let g:base16_gui06 = "302C2D"
-let s:gui07        = "201C1D"
-let g:base16_gui07 = "201C1D"
-let s:gui08        = "F7939B"
-let g:base16_gui08 = "F7939B"
-let s:gui09        = "F6661E"
-let g:base16_gui09 = "F6661E"
-let s:gui0A        = "FBE0D9"
-let g:base16_gui0A = "FBE0D9"
-let s:gui0B        = "94E1B0"
-let g:base16_gui0B = "94E1B0"
-let s:gui0C        = "DC3318"
-let g:base16_gui0C = "DC3318"
-let s:gui0D        = "DA103F"
-let g:base16_gui0D = "DA103F"
-let s:gui0E        = "1D8991"
-let g:base16_gui0E = "1D8991"
-let s:gui0F        = "E58C92"
-let g:base16_gui0F = "E58C92"
+let s:gui00        = "fdf0ed"
+let g:base16_gui00 = "fdf0ed"
+let s:gui01        = "fadad1"
+let g:base16_gui01 = "fadad1"
+let s:gui02        = "f9cbbe"
+let g:base16_gui02 = "f9cbbe"
+let s:gui03        = "bdb3b1"
+let g:base16_gui03 = "bdb3b1"
+let s:gui04        = "948c8a"
+let g:base16_gui04 = "948c8a"
+let s:gui05        = "403c3d"
+let g:base16_gui05 = "403c3d"
+let s:gui06        = "302c2d"
+let g:base16_gui06 = "302c2d"
+let s:gui07        = "201c1d"
+let g:base16_gui07 = "201c1d"
+let s:gui08        = "f7939b"
+let g:base16_gui08 = "f7939b"
+let s:gui09        = "f6661e"
+let g:base16_gui09 = "f6661e"
+let s:gui0A        = "fbe0d9"
+let g:base16_gui0A = "fbe0d9"
+let s:gui0B        = "94e1b0"
+let g:base16_gui0B = "94e1b0"
+let s:gui0C        = "dc3318"
+let g:base16_gui0C = "dc3318"
+let s:gui0D        = "da103f"
+let g:base16_gui0D = "da103f"
+let s:gui0E        = "1d8991"
+let g:base16_gui0E = "1d8991"
+let s:gui0F        = "e58c92"
+let g:base16_gui0F = "e58c92"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#FDF0ED"
-  let g:terminal_color_1 =  "#F7939B"
-  let g:terminal_color_2 =  "#94E1B0"
-  let g:terminal_color_3 =  "#FBE0D9"
-  let g:terminal_color_4 =  "#DA103F"
-  let g:terminal_color_5 =  "#1D8991"
-  let g:terminal_color_6 =  "#DC3318"
-  let g:terminal_color_7 =  "#403C3D"
-  let g:terminal_color_8 =  "#BDB3B1"
-  let g:terminal_color_9 =  "#F7939B"
-  let g:terminal_color_10 = "#94E1B0"
-  let g:terminal_color_11 = "#FBE0D9"
-  let g:terminal_color_12 = "#DA103F"
-  let g:terminal_color_13 = "#1D8991"
-  let g:terminal_color_14 = "#DC3318"
-  let g:terminal_color_15 = "#201C1D"
+  let g:terminal_color_0 =  "#fdf0ed"
+  let g:terminal_color_1 =  "#f7939b"
+  let g:terminal_color_2 =  "#94e1b0"
+  let g:terminal_color_3 =  "#fbe0d9"
+  let g:terminal_color_4 =  "#da103f"
+  let g:terminal_color_5 =  "#1d8991"
+  let g:terminal_color_6 =  "#dc3318"
+  let g:terminal_color_7 =  "#403c3d"
+  let g:terminal_color_8 =  "#bdb3b1"
+  let g:terminal_color_9 =  "#f7939b"
+  let g:terminal_color_10 = "#94e1b0"
+  let g:terminal_color_11 = "#fbe0d9"
+  let g:terminal_color_12 = "#da103f"
+  let g:terminal_color_13 = "#1d8991"
+  let g:terminal_color_14 = "#dc3318"
+  let g:terminal_color_15 = "#201c1d"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#FDF0ED",
-        \ "#F7939B",
-        \ "#94E1B0",
-        \ "#FBE0D9",
-        \ "#DA103F",
-        \ "#1D8991",
-        \ "#DC3318",
-        \ "#403C3D",
-        \ "#BDB3B1",
-        \ "#F7939B",
-        \ "#94E1B0",
-        \ "#FBE0D9",
-        \ "#DA103F",
-        \ "#1D8991",
-        \ "#DC3318",
-        \ "#201C1D",
+        \ "#fdf0ed",
+        \ "#f7939b",
+        \ "#94e1b0",
+        \ "#fbe0d9",
+        \ "#da103f",
+        \ "#1d8991",
+        \ "#dc3318",
+        \ "#403c3d",
+        \ "#bdb3b1",
+        \ "#f7939b",
+        \ "#94e1b0",
+        \ "#fbe0d9",
+        \ "#da103f",
+        \ "#1d8991",
+        \ "#dc3318",
+        \ "#201c1d",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-horizon-terminal-dark.vim b/colors/base16-horizon-terminal-dark.vim
index 5bb105b..b206e52 100644
--- a/colors/base16-horizon-terminal-dark.vim
+++ b/colors/base16-horizon-terminal-dark.vim
@@ -2,7 +2,7 @@
 
 " base16-vim (https://github.com/chriskempson/base16-vim)
 " by Chris Kempson (http://chriskempson.com)
-" Horizon Terminal Dark scheme by Michaël Ball (http://github.com/michael-ball/)
+" Horizon Dark scheme by Michaël Ball (http://github.com/michael-ball/)
 
 " This enables the coresponding base16-shell script to run so that
 " :colorscheme works in terminals supported by base16-shell scripts
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "1C1E26"
-let g:base16_gui00 = "1C1E26"
+let s:gui00        = "1c1e26"
+let g:base16_gui00 = "1c1e26"
 let s:gui01        = "232530"
 let g:base16_gui01 = "232530"
-let s:gui02        = "2E303E"
-let g:base16_gui02 = "2E303E"
-let s:gui03        = "6F6F70"
-let g:base16_gui03 = "6F6F70"
-let s:gui04        = "9DA0A2"
-let g:base16_gui04 = "9DA0A2"
-let s:gui05        = "CBCED0"
-let g:base16_gui05 = "CBCED0"
-let s:gui06        = "DCDFE4"
-let g:base16_gui06 = "DCDFE4"
-let s:gui07        = "E3E6EE"
-let g:base16_gui07 = "E3E6EE"
-let s:gui08        = "E95678"
-let g:base16_gui08 = "E95678"
-let s:gui09        = "FAB795"
-let g:base16_gui09 = "FAB795"
-let s:gui0A        = "FAC29A"
-let g:base16_gui0A = "FAC29A"
-let s:gui0B        = "29D398"
-let g:base16_gui0B = "29D398"
-let s:gui0C        = "59E1E3"
-let g:base16_gui0C = "59E1E3"
-let s:gui0D        = "26BBD9"
-let g:base16_gui0D = "26BBD9"
-let s:gui0E        = "EE64AC"
-let g:base16_gui0E = "EE64AC"
-let s:gui0F        = "F09383"
-let g:base16_gui0F = "F09383"
+let s:gui02        = "2e303e"
+let g:base16_gui02 = "2e303e"
+let s:gui03        = "6f6f70"
+let g:base16_gui03 = "6f6f70"
+let s:gui04        = "9da0a2"
+let g:base16_gui04 = "9da0a2"
+let s:gui05        = "cbced0"
+let g:base16_gui05 = "cbced0"
+let s:gui06        = "dcdfe4"
+let g:base16_gui06 = "dcdfe4"
+let s:gui07        = "e3e6ee"
+let g:base16_gui07 = "e3e6ee"
+let s:gui08        = "e95678"
+let g:base16_gui08 = "e95678"
+let s:gui09        = "fab795"
+let g:base16_gui09 = "fab795"
+let s:gui0A        = "fac29a"
+let g:base16_gui0A = "fac29a"
+let s:gui0B        = "29d398"
+let g:base16_gui0B = "29d398"
+let s:gui0C        = "59e1e3"
+let g:base16_gui0C = "59e1e3"
+let s:gui0D        = "26bbd9"
+let g:base16_gui0D = "26bbd9"
+let s:gui0E        = "ee64ac"
+let g:base16_gui0E = "ee64ac"
+let s:gui0F        = "f09383"
+let g:base16_gui0F = "f09383"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#1C1E26"
-  let g:terminal_color_1 =  "#E95678"
-  let g:terminal_color_2 =  "#29D398"
-  let g:terminal_color_3 =  "#FAC29A"
-  let g:terminal_color_4 =  "#26BBD9"
-  let g:terminal_color_5 =  "#EE64AC"
-  let g:terminal_color_6 =  "#59E1E3"
-  let g:terminal_color_7 =  "#CBCED0"
-  let g:terminal_color_8 =  "#6F6F70"
-  let g:terminal_color_9 =  "#E95678"
-  let g:terminal_color_10 = "#29D398"
-  let g:terminal_color_11 = "#FAC29A"
-  let g:terminal_color_12 = "#26BBD9"
-  let g:terminal_color_13 = "#EE64AC"
-  let g:terminal_color_14 = "#59E1E3"
-  let g:terminal_color_15 = "#E3E6EE"
+  let g:terminal_color_0 =  "#1c1e26"
+  let g:terminal_color_1 =  "#e95678"
+  let g:terminal_color_2 =  "#29d398"
+  let g:terminal_color_3 =  "#fac29a"
+  let g:terminal_color_4 =  "#26bbd9"
+  let g:terminal_color_5 =  "#ee64ac"
+  let g:terminal_color_6 =  "#59e1e3"
+  let g:terminal_color_7 =  "#cbced0"
+  let g:terminal_color_8 =  "#6f6f70"
+  let g:terminal_color_9 =  "#e95678"
+  let g:terminal_color_10 = "#29d398"
+  let g:terminal_color_11 = "#fac29a"
+  let g:terminal_color_12 = "#26bbd9"
+  let g:terminal_color_13 = "#ee64ac"
+  let g:terminal_color_14 = "#59e1e3"
+  let g:terminal_color_15 = "#e3e6ee"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#1C1E26",
-        \ "#E95678",
-        \ "#29D398",
-        \ "#FAC29A",
-        \ "#26BBD9",
-        \ "#EE64AC",
-        \ "#59E1E3",
-        \ "#CBCED0",
-        \ "#6F6F70",
-        \ "#E95678",
-        \ "#29D398",
-        \ "#FAC29A",
-        \ "#26BBD9",
-        \ "#EE64AC",
-        \ "#59E1E3",
-        \ "#E3E6EE",
+        \ "#1c1e26",
+        \ "#e95678",
+        \ "#29d398",
+        \ "#fac29a",
+        \ "#26bbd9",
+        \ "#ee64ac",
+        \ "#59e1e3",
+        \ "#cbced0",
+        \ "#6f6f70",
+        \ "#e95678",
+        \ "#29d398",
+        \ "#fac29a",
+        \ "#26bbd9",
+        \ "#ee64ac",
+        \ "#59e1e3",
+        \ "#e3e6ee",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-horizon-terminal-light.vim b/colors/base16-horizon-terminal-light.vim
index e5cde33..af67537 100644
--- a/colors/base16-horizon-terminal-light.vim
+++ b/colors/base16-horizon-terminal-light.vim
@@ -2,7 +2,7 @@
 
 " base16-vim (https://github.com/chriskempson/base16-vim)
 " by Chris Kempson (http://chriskempson.com)
-" Horizon Terminal Light scheme by Michaël Ball (http://github.com/michael-ball/)
+" Horizon Light scheme by Michaël Ball (http://github.com/michael-ball/)
 
 " This enables the coresponding base16-shell script to run so that
 " :colorscheme works in terminals supported by base16-shell scripts
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "FDF0ED"
-let g:base16_gui00 = "FDF0ED"
-let s:gui01        = "FADAD1"
-let g:base16_gui01 = "FADAD1"
-let s:gui02        = "F9CBBE"
-let g:base16_gui02 = "F9CBBE"
-let s:gui03        = "BDB3B1"
-let g:base16_gui03 = "BDB3B1"
-let s:gui04        = "948C8A"
-let g:base16_gui04 = "948C8A"
-let s:gui05        = "403C3D"
-let g:base16_gui05 = "403C3D"
-let s:gui06        = "302C2D"
-let g:base16_gui06 = "302C2D"
-let s:gui07        = "201C1D"
-let g:base16_gui07 = "201C1D"
-let s:gui08        = "E95678"
-let g:base16_gui08 = "E95678"
-let s:gui09        = "F9CEC3"
-let g:base16_gui09 = "F9CEC3"
-let s:gui0A        = "FADAD1"
-let g:base16_gui0A = "FADAD1"
-let s:gui0B        = "29D398"
-let g:base16_gui0B = "29D398"
-let s:gui0C        = "59E1E3"
-let g:base16_gui0C = "59E1E3"
-let s:gui0D        = "26BBD9"
-let g:base16_gui0D = "26BBD9"
-let s:gui0E        = "EE64AC"
-let g:base16_gui0E = "EE64AC"
-let s:gui0F        = "F9CBBE"
-let g:base16_gui0F = "F9CBBE"
+let s:gui00        = "fdf0ed"
+let g:base16_gui00 = "fdf0ed"
+let s:gui01        = "fadad1"
+let g:base16_gui01 = "fadad1"
+let s:gui02        = "f9cbbe"
+let g:base16_gui02 = "f9cbbe"
+let s:gui03        = "bdb3b1"
+let g:base16_gui03 = "bdb3b1"
+let s:gui04        = "948c8a"
+let g:base16_gui04 = "948c8a"
+let s:gui05        = "403c3d"
+let g:base16_gui05 = "403c3d"
+let s:gui06        = "302c2d"
+let g:base16_gui06 = "302c2d"
+let s:gui07        = "201c1d"
+let g:base16_gui07 = "201c1d"
+let s:gui08        = "e95678"
+let g:base16_gui08 = "e95678"
+let s:gui09        = "f9cec3"
+let g:base16_gui09 = "f9cec3"
+let s:gui0A        = "fadad1"
+let g:base16_gui0A = "fadad1"
+let s:gui0B        = "29d398"
+let g:base16_gui0B = "29d398"
+let s:gui0C        = "59e1e3"
+let g:base16_gui0C = "59e1e3"
+let s:gui0D        = "26bbd9"
+let g:base16_gui0D = "26bbd9"
+let s:gui0E        = "ee64ac"
+let g:base16_gui0E = "ee64ac"
+let s:gui0F        = "f9cbbe"
+let g:base16_gui0F = "f9cbbe"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#FDF0ED"
-  let g:terminal_color_1 =  "#E95678"
-  let g:terminal_color_2 =  "#29D398"
-  let g:terminal_color_3 =  "#FADAD1"
-  let g:terminal_color_4 =  "#26BBD9"
-  let g:terminal_color_5 =  "#EE64AC"
-  let g:terminal_color_6 =  "#59E1E3"
-  let g:terminal_color_7 =  "#403C3D"
-  let g:terminal_color_8 =  "#BDB3B1"
-  let g:terminal_color_9 =  "#E95678"
-  let g:terminal_color_10 = "#29D398"
-  let g:terminal_color_11 = "#FADAD1"
-  let g:terminal_color_12 = "#26BBD9"
-  let g:terminal_color_13 = "#EE64AC"
-  let g:terminal_color_14 = "#59E1E3"
-  let g:terminal_color_15 = "#201C1D"
+  let g:terminal_color_0 =  "#fdf0ed"
+  let g:terminal_color_1 =  "#e95678"
+  let g:terminal_color_2 =  "#29d398"
+  let g:terminal_color_3 =  "#fadad1"
+  let g:terminal_color_4 =  "#26bbd9"
+  let g:terminal_color_5 =  "#ee64ac"
+  let g:terminal_color_6 =  "#59e1e3"
+  let g:terminal_color_7 =  "#403c3d"
+  let g:terminal_color_8 =  "#bdb3b1"
+  let g:terminal_color_9 =  "#e95678"
+  let g:terminal_color_10 = "#29d398"
+  let g:terminal_color_11 = "#fadad1"
+  let g:terminal_color_12 = "#26bbd9"
+  let g:terminal_color_13 = "#ee64ac"
+  let g:terminal_color_14 = "#59e1e3"
+  let g:terminal_color_15 = "#201c1d"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#FDF0ED",
-        \ "#E95678",
-        \ "#29D398",
-        \ "#FADAD1",
-        \ "#26BBD9",
-        \ "#EE64AC",
-        \ "#59E1E3",
-        \ "#403C3D",
-        \ "#BDB3B1",
-        \ "#E95678",
-        \ "#29D398",
-        \ "#FADAD1",
-        \ "#26BBD9",
-        \ "#EE64AC",
-        \ "#59E1E3",
-        \ "#201C1D",
+        \ "#fdf0ed",
+        \ "#e95678",
+        \ "#29d398",
+        \ "#fadad1",
+        \ "#26bbd9",
+        \ "#ee64ac",
+        \ "#59e1e3",
+        \ "#403c3d",
+        \ "#bdb3b1",
+        \ "#e95678",
+        \ "#29d398",
+        \ "#fadad1",
+        \ "#26bbd9",
+        \ "#ee64ac",
+        \ "#59e1e3",
+        \ "#201c1d",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-humanoid-dark.vim b/colors/base16-humanoid-dark.vim
index c3ce8f0..a177843 100644
--- a/colors/base16-humanoid-dark.vim
+++ b/colors/base16-humanoid-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-humanoid-light.vim b/colors/base16-humanoid-light.vim
index 93a052d..5833a45 100644
--- a/colors/base16-humanoid-light.vim
+++ b/colors/base16-humanoid-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-ia-dark.vim b/colors/base16-ia-dark.vim
index c180fd7..f40ea7a 100644
--- a/colors/base16-ia-dark.vim
+++ b/colors/base16-ia-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-ia-light.vim b/colors/base16-ia-light.vim
index 93357ad..f2e8054 100644
--- a/colors/base16-ia-light.vim
+++ b/colors/base16-ia-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim
index 2de99e3..306a59e 100644
--- a/colors/base16-icy.vim
+++ b/colors/base16-icy.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim
index d6f07ac..5321d13 100644
--- a/colors/base16-irblack.vim
+++ b/colors/base16-irblack.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index b090338..deaeba3 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-kanagawa.vim b/colors/base16-kanagawa.vim
new file mode 100644
index 0000000..31737fa
--- /dev/null
+++ b/colors/base16-kanagawa.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Kanagawa scheme by Tommaso Laurenzi (https://github.com/rebelot)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-kanagawa.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "1f1f28"
+let g:base16_gui00 = "1f1f28"
+let s:gui01        = "16161d"
+let g:base16_gui01 = "16161d"
+let s:gui02        = "223249"
+let g:base16_gui02 = "223249"
+let s:gui03        = "54546d"
+let g:base16_gui03 = "54546d"
+let s:gui04        = "727169"
+let g:base16_gui04 = "727169"
+let s:gui05        = "dcd7ba"
+let g:base16_gui05 = "dcd7ba"
+let s:gui06        = "c8c093"
+let g:base16_gui06 = "c8c093"
+let s:gui07        = "717c7c"
+let g:base16_gui07 = "717c7c"
+let s:gui08        = "c34043"
+let g:base16_gui08 = "c34043"
+let s:gui09        = "ffa066"
+let g:base16_gui09 = "ffa066"
+let s:gui0A        = "c0a36e"
+let g:base16_gui0A = "c0a36e"
+let s:gui0B        = "76946a"
+let g:base16_gui0B = "76946a"
+let s:gui0C        = "6a9589"
+let g:base16_gui0C = "6a9589"
+let s:gui0D        = "7e9cd8"
+let g:base16_gui0D = "7e9cd8"
+let s:gui0E        = "957fb8"
+let g:base16_gui0E = "957fb8"
+let s:gui0F        = "d27e99"
+let g:base16_gui0F = "d27e99"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1f1f28"
+  let g:terminal_color_1 =  "#c34043"
+  let g:terminal_color_2 =  "#76946a"
+  let g:terminal_color_3 =  "#c0a36e"
+  let g:terminal_color_4 =  "#7e9cd8"
+  let g:terminal_color_5 =  "#957fb8"
+  let g:terminal_color_6 =  "#6a9589"
+  let g:terminal_color_7 =  "#dcd7ba"
+  let g:terminal_color_8 =  "#54546d"
+  let g:terminal_color_9 =  "#c34043"
+  let g:terminal_color_10 = "#76946a"
+  let g:terminal_color_11 = "#c0a36e"
+  let g:terminal_color_12 = "#7e9cd8"
+  let g:terminal_color_13 = "#957fb8"
+  let g:terminal_color_14 = "#6a9589"
+  let g:terminal_color_15 = "#717c7c"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#1f1f28",
+        \ "#c34043",
+        \ "#76946a",
+        \ "#c0a36e",
+        \ "#7e9cd8",
+        \ "#957fb8",
+        \ "#6a9589",
+        \ "#dcd7ba",
+        \ "#54546d",
+        \ "#c34043",
+        \ "#76946a",
+        \ "#c0a36e",
+        \ "#7e9cd8",
+        \ "#957fb8",
+        \ "#6a9589",
+        \ "#717c7c",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-kanagawa"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-katy.vim b/colors/base16-katy.vim
new file mode 100644
index 0000000..f3f5ad4
--- /dev/null
+++ b/colors/base16-katy.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Katy scheme by George Essig (https://github.com/gessig)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-katy.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "292d3e"
+let g:base16_gui00 = "292d3e"
+let s:gui01        = "444267"
+let g:base16_gui01 = "444267"
+let s:gui02        = "5c598b"
+let g:base16_gui02 = "5c598b"
+let s:gui03        = "676e95"
+let g:base16_gui03 = "676e95"
+let s:gui04        = "8796b0"
+let g:base16_gui04 = "8796b0"
+let s:gui05        = "959dcb"
+let g:base16_gui05 = "959dcb"
+let s:gui06        = "959dcb"
+let g:base16_gui06 = "959dcb"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "6e98e1"
+let g:base16_gui08 = "6e98e1"
+let s:gui09        = "f78c6c"
+let g:base16_gui09 = "f78c6c"
+let s:gui0A        = "e0a557"
+let g:base16_gui0A = "e0a557"
+let s:gui0B        = "78c06e"
+let g:base16_gui0B = "78c06e"
+let s:gui0C        = "83b7e5"
+let g:base16_gui0C = "83b7e5"
+let s:gui0D        = "82aaff"
+let g:base16_gui0D = "82aaff"
+let s:gui0E        = "c792ea"
+let g:base16_gui0E = "c792ea"
+let s:gui0F        = "ff5370"
+let g:base16_gui0F = "ff5370"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#292d3e"
+  let g:terminal_color_1 =  "#6e98e1"
+  let g:terminal_color_2 =  "#78c06e"
+  let g:terminal_color_3 =  "#e0a557"
+  let g:terminal_color_4 =  "#82aaff"
+  let g:terminal_color_5 =  "#c792ea"
+  let g:terminal_color_6 =  "#83b7e5"
+  let g:terminal_color_7 =  "#959dcb"
+  let g:terminal_color_8 =  "#676e95"
+  let g:terminal_color_9 =  "#6e98e1"
+  let g:terminal_color_10 = "#78c06e"
+  let g:terminal_color_11 = "#e0a557"
+  let g:terminal_color_12 = "#82aaff"
+  let g:terminal_color_13 = "#c792ea"
+  let g:terminal_color_14 = "#83b7e5"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#292d3e",
+        \ "#6e98e1",
+        \ "#78c06e",
+        \ "#e0a557",
+        \ "#82aaff",
+        \ "#c792ea",
+        \ "#83b7e5",
+        \ "#959dcb",
+        \ "#676e95",
+        \ "#6e98e1",
+        \ "#78c06e",
+        \ "#e0a557",
+        \ "#82aaff",
+        \ "#c792ea",
+        \ "#83b7e5",
+        \ "#ffffff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-katy"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-kimber.vim b/colors/base16-kimber.vim
index 7011d35..5651bd1 100644
--- a/colors/base16-kimber.vim
+++ b/colors/base16-kimber.vim
@@ -19,34 +19,34 @@ let s:gui00        = "222222"
 let g:base16_gui00 = "222222"
 let s:gui01        = "313131"
 let g:base16_gui01 = "313131"
-let s:gui02        = "555D55"
-let g:base16_gui02 = "555D55"
+let s:gui02        = "555d55"
+let g:base16_gui02 = "555d55"
 let s:gui03        = "644646"
 let g:base16_gui03 = "644646"
-let s:gui04        = "5A5A5A"
-let g:base16_gui04 = "5A5A5A"
-let s:gui05        = "DEDEE7"
-let g:base16_gui05 = "DEDEE7"
-let s:gui06        = "C3C3B4"
-let g:base16_gui06 = "C3C3B4"
-let s:gui07        = "FFFFE6"
-let g:base16_gui07 = "FFFFE6"
-let s:gui08        = "C88C8C"
-let g:base16_gui08 = "C88C8C"
-let s:gui09        = "476C88"
-let g:base16_gui09 = "476C88"
-let s:gui0A        = "D8B56D"
-let g:base16_gui0A = "D8B56D"
-let s:gui0B        = "99C899"
-let g:base16_gui0B = "99C899"
-let s:gui0C        = "78B4B4"
-let g:base16_gui0C = "78B4B4"
-let s:gui0D        = "537C9C"
-let g:base16_gui0D = "537C9C"
-let s:gui0E        = "86CACD"
-let g:base16_gui0E = "86CACD"
-let s:gui0F        = "704F4F"
-let g:base16_gui0F = "704F4F"
+let s:gui04        = "5a5a5a"
+let g:base16_gui04 = "5a5a5a"
+let s:gui05        = "dedee7"
+let g:base16_gui05 = "dedee7"
+let s:gui06        = "c3c3b4"
+let g:base16_gui06 = "c3c3b4"
+let s:gui07        = "ffffe6"
+let g:base16_gui07 = "ffffe6"
+let s:gui08        = "c88c8c"
+let g:base16_gui08 = "c88c8c"
+let s:gui09        = "476c88"
+let g:base16_gui09 = "476c88"
+let s:gui0A        = "d8b56d"
+let g:base16_gui0A = "d8b56d"
+let s:gui0B        = "99c899"
+let g:base16_gui0B = "99c899"
+let s:gui0C        = "78b4b4"
+let g:base16_gui0C = "78b4b4"
+let s:gui0D        = "537c9c"
+let g:base16_gui0D = "537c9c"
+let s:gui0E        = "86cacd"
+let g:base16_gui0E = "86cacd"
+let s:gui0F        = "704f4f"
+let g:base16_gui0F = "704f4f"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#222222"
-  let g:terminal_color_1 =  "#C88C8C"
-  let g:terminal_color_2 =  "#99C899"
-  let g:terminal_color_3 =  "#D8B56D"
-  let g:terminal_color_4 =  "#537C9C"
-  let g:terminal_color_5 =  "#86CACD"
-  let g:terminal_color_6 =  "#78B4B4"
-  let g:terminal_color_7 =  "#DEDEE7"
+  let g:terminal_color_1 =  "#c88c8c"
+  let g:terminal_color_2 =  "#99c899"
+  let g:terminal_color_3 =  "#d8b56d"
+  let g:terminal_color_4 =  "#537c9c"
+  let g:terminal_color_5 =  "#86cacd"
+  let g:terminal_color_6 =  "#78b4b4"
+  let g:terminal_color_7 =  "#dedee7"
   let g:terminal_color_8 =  "#644646"
-  let g:terminal_color_9 =  "#C88C8C"
-  let g:terminal_color_10 = "#99C899"
-  let g:terminal_color_11 = "#D8B56D"
-  let g:terminal_color_12 = "#537C9C"
-  let g:terminal_color_13 = "#86CACD"
-  let g:terminal_color_14 = "#78B4B4"
-  let g:terminal_color_15 = "#FFFFE6"
+  let g:terminal_color_9 =  "#c88c8c"
+  let g:terminal_color_10 = "#99c899"
+  let g:terminal_color_11 = "#d8b56d"
+  let g:terminal_color_12 = "#537c9c"
+  let g:terminal_color_13 = "#86cacd"
+  let g:terminal_color_14 = "#78b4b4"
+  let g:terminal_color_15 = "#ffffe6"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#222222",
-        \ "#C88C8C",
-        \ "#99C899",
-        \ "#D8B56D",
-        \ "#537C9C",
-        \ "#86CACD",
-        \ "#78B4B4",
-        \ "#DEDEE7",
+        \ "#c88c8c",
+        \ "#99c899",
+        \ "#d8b56d",
+        \ "#537c9c",
+        \ "#86cacd",
+        \ "#78b4b4",
+        \ "#dedee7",
         \ "#644646",
-        \ "#C88C8C",
-        \ "#99C899",
-        \ "#D8B56D",
-        \ "#537C9C",
-        \ "#86CACD",
-        \ "#78B4B4",
-        \ "#FFFFE6",
+        \ "#c88c8c",
+        \ "#99c899",
+        \ "#d8b56d",
+        \ "#537c9c",
+        \ "#86cacd",
+        \ "#78b4b4",
+        \ "#ffffe6",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-lime.vim b/colors/base16-lime.vim
new file mode 100644
index 0000000..daef8ae
--- /dev/null
+++ b/colors/base16-lime.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" lime scheme by limelier
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-lime.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "1a1a2f"
+let g:base16_gui00 = "1a1a2f"
+let s:gui01        = "202030"
+let g:base16_gui01 = "202030"
+let s:gui02        = "2a2a3f"
+let g:base16_gui02 = "2a2a3f"
+let s:gui03        = "313140"
+let g:base16_gui03 = "313140"
+let s:gui04        = "515155"
+let g:base16_gui04 = "515155"
+let s:gui05        = "818175"
+let g:base16_gui05 = "818175"
+let s:gui06        = "fff2d1"
+let g:base16_gui06 = "fff2d1"
+let s:gui07        = "fff8e1"
+let g:base16_gui07 = "fff8e1"
+let s:gui08        = "ff662a"
+let g:base16_gui08 = "ff662a"
+let s:gui09        = "ff773a"
+let g:base16_gui09 = "ff773a"
+let s:gui0A        = "ffd15e"
+let g:base16_gui0A = "ffd15e"
+let s:gui0B        = "8cd97c"
+let g:base16_gui0B = "8cd97c"
+let s:gui0C        = "4cad83"
+let g:base16_gui0C = "4cad83"
+let s:gui0D        = "2b926f"
+let g:base16_gui0D = "2b926f"
+let s:gui0E        = "1b825f"
+let g:base16_gui0E = "1b825f"
+let s:gui0F        = "b4d97c"
+let g:base16_gui0F = "b4d97c"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1a1a2f"
+  let g:terminal_color_1 =  "#ff662a"
+  let g:terminal_color_2 =  "#8cd97c"
+  let g:terminal_color_3 =  "#ffd15e"
+  let g:terminal_color_4 =  "#2b926f"
+  let g:terminal_color_5 =  "#1b825f"
+  let g:terminal_color_6 =  "#4cad83"
+  let g:terminal_color_7 =  "#818175"
+  let g:terminal_color_8 =  "#313140"
+  let g:terminal_color_9 =  "#ff662a"
+  let g:terminal_color_10 = "#8cd97c"
+  let g:terminal_color_11 = "#ffd15e"
+  let g:terminal_color_12 = "#2b926f"
+  let g:terminal_color_13 = "#1b825f"
+  let g:terminal_color_14 = "#4cad83"
+  let g:terminal_color_15 = "#fff8e1"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#1a1a2f",
+        \ "#ff662a",
+        \ "#8cd97c",
+        \ "#ffd15e",
+        \ "#2b926f",
+        \ "#1b825f",
+        \ "#4cad83",
+        \ "#818175",
+        \ "#313140",
+        \ "#ff662a",
+        \ "#8cd97c",
+        \ "#ffd15e",
+        \ "#2b926f",
+        \ "#1b825f",
+        \ "#4cad83",
+        \ "#fff8e1",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-lime"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim
index 3b7cc94..6accdf0 100644
--- a/colors/base16-macintosh.vim
+++ b/colors/base16-macintosh.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index cb3964f..cef773d 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim
index 2df6400..5254f3d 100644
--- a/colors/base16-materia.vim
+++ b/colors/base16-materia.vim
@@ -17,36 +17,36 @@ endif
 " GUI color definitions
 let s:gui00        = "263238"
 let g:base16_gui00 = "263238"
-let s:gui01        = "2C393F"
-let g:base16_gui01 = "2C393F"
-let s:gui02        = "37474F"
-let g:base16_gui02 = "37474F"
+let s:gui01        = "2c393f"
+let g:base16_gui01 = "2c393f"
+let s:gui02        = "37474f"
+let g:base16_gui02 = "37474f"
 let s:gui03        = "707880"
 let g:base16_gui03 = "707880"
-let s:gui04        = "C9CCD3"
-let g:base16_gui04 = "C9CCD3"
-let s:gui05        = "CDD3DE"
-let g:base16_gui05 = "CDD3DE"
-let s:gui06        = "D5DBE5"
-let g:base16_gui06 = "D5DBE5"
-let s:gui07        = "FFFFFF"
-let g:base16_gui07 = "FFFFFF"
-let s:gui08        = "EC5F67"
-let g:base16_gui08 = "EC5F67"
-let s:gui09        = "EA9560"
-let g:base16_gui09 = "EA9560"
-let s:gui0A        = "FFCC00"
-let g:base16_gui0A = "FFCC00"
-let s:gui0B        = "8BD649"
-let g:base16_gui0B = "8BD649"
-let s:gui0C        = "80CBC4"
-let g:base16_gui0C = "80CBC4"
-let s:gui0D        = "89DDFF"
-let g:base16_gui0D = "89DDFF"
-let s:gui0E        = "82AAFF"
-let g:base16_gui0E = "82AAFF"
-let s:gui0F        = "EC5F67"
-let g:base16_gui0F = "EC5F67"
+let s:gui04        = "c9ccd3"
+let g:base16_gui04 = "c9ccd3"
+let s:gui05        = "cdd3de"
+let g:base16_gui05 = "cdd3de"
+let s:gui06        = "d5dbe5"
+let g:base16_gui06 = "d5dbe5"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "ec5f67"
+let g:base16_gui08 = "ec5f67"
+let s:gui09        = "ea9560"
+let g:base16_gui09 = "ea9560"
+let s:gui0A        = "ffcc00"
+let g:base16_gui0A = "ffcc00"
+let s:gui0B        = "8bd649"
+let g:base16_gui0B = "8bd649"
+let s:gui0C        = "80cbc4"
+let g:base16_gui0C = "80cbc4"
+let s:gui0D        = "89ddff"
+let g:base16_gui0D = "89ddff"
+let s:gui0E        = "82aaff"
+let g:base16_gui0E = "82aaff"
+let s:gui0F        = "ec5f67"
+let g:base16_gui0F = "ec5f67"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#263238"
-  let g:terminal_color_1 =  "#EC5F67"
-  let g:terminal_color_2 =  "#8BD649"
-  let g:terminal_color_3 =  "#FFCC00"
-  let g:terminal_color_4 =  "#89DDFF"
-  let g:terminal_color_5 =  "#82AAFF"
-  let g:terminal_color_6 =  "#80CBC4"
-  let g:terminal_color_7 =  "#CDD3DE"
+  let g:terminal_color_1 =  "#ec5f67"
+  let g:terminal_color_2 =  "#8bd649"
+  let g:terminal_color_3 =  "#ffcc00"
+  let g:terminal_color_4 =  "#89ddff"
+  let g:terminal_color_5 =  "#82aaff"
+  let g:terminal_color_6 =  "#80cbc4"
+  let g:terminal_color_7 =  "#cdd3de"
   let g:terminal_color_8 =  "#707880"
-  let g:terminal_color_9 =  "#EC5F67"
-  let g:terminal_color_10 = "#8BD649"
-  let g:terminal_color_11 = "#FFCC00"
-  let g:terminal_color_12 = "#89DDFF"
-  let g:terminal_color_13 = "#82AAFF"
-  let g:terminal_color_14 = "#80CBC4"
-  let g:terminal_color_15 = "#FFFFFF"
+  let g:terminal_color_9 =  "#ec5f67"
+  let g:terminal_color_10 = "#8bd649"
+  let g:terminal_color_11 = "#ffcc00"
+  let g:terminal_color_12 = "#89ddff"
+  let g:terminal_color_13 = "#82aaff"
+  let g:terminal_color_14 = "#80cbc4"
+  let g:terminal_color_15 = "#ffffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#263238",
-        \ "#EC5F67",
-        \ "#8BD649",
-        \ "#FFCC00",
-        \ "#89DDFF",
-        \ "#82AAFF",
-        \ "#80CBC4",
-        \ "#CDD3DE",
+        \ "#ec5f67",
+        \ "#8bd649",
+        \ "#ffcc00",
+        \ "#89ddff",
+        \ "#82aaff",
+        \ "#80cbc4",
+        \ "#cdd3de",
         \ "#707880",
-        \ "#EC5F67",
-        \ "#8BD649",
-        \ "#FFCC00",
-        \ "#89DDFF",
-        \ "#82AAFF",
-        \ "#80CBC4",
-        \ "#FFFFFF",
+        \ "#ec5f67",
+        \ "#8bd649",
+        \ "#ffcc00",
+        \ "#89ddff",
+        \ "#82aaff",
+        \ "#80cbc4",
+        \ "#ffffff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim
index e28745f..995e1b5 100644
--- a/colors/base16-material-darker.vim
+++ b/colors/base16-material-darker.vim
@@ -21,32 +21,32 @@ let s:gui01        = "303030"
 let g:base16_gui01 = "303030"
 let s:gui02        = "353535"
 let g:base16_gui02 = "353535"
-let s:gui03        = "4A4A4A"
-let g:base16_gui03 = "4A4A4A"
-let s:gui04        = "B2CCD6"
-let g:base16_gui04 = "B2CCD6"
-let s:gui05        = "EEFFFF"
-let g:base16_gui05 = "EEFFFF"
-let s:gui06        = "EEFFFF"
-let g:base16_gui06 = "EEFFFF"
-let s:gui07        = "FFFFFF"
-let g:base16_gui07 = "FFFFFF"
-let s:gui08        = "F07178"
-let g:base16_gui08 = "F07178"
-let s:gui09        = "F78C6C"
-let g:base16_gui09 = "F78C6C"
-let s:gui0A        = "FFCB6B"
-let g:base16_gui0A = "FFCB6B"
-let s:gui0B        = "C3E88D"
-let g:base16_gui0B = "C3E88D"
-let s:gui0C        = "89DDFF"
-let g:base16_gui0C = "89DDFF"
-let s:gui0D        = "82AAFF"
-let g:base16_gui0D = "82AAFF"
-let s:gui0E        = "C792EA"
-let g:base16_gui0E = "C792EA"
-let s:gui0F        = "FF5370"
-let g:base16_gui0F = "FF5370"
+let s:gui03        = "4a4a4a"
+let g:base16_gui03 = "4a4a4a"
+let s:gui04        = "b2ccd6"
+let g:base16_gui04 = "b2ccd6"
+let s:gui05        = "eeffff"
+let g:base16_gui05 = "eeffff"
+let s:gui06        = "eeffff"
+let g:base16_gui06 = "eeffff"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "f07178"
+let g:base16_gui08 = "f07178"
+let s:gui09        = "f78c6c"
+let g:base16_gui09 = "f78c6c"
+let s:gui0A        = "ffcb6b"
+let g:base16_gui0A = "ffcb6b"
+let s:gui0B        = "c3e88d"
+let g:base16_gui0B = "c3e88d"
+let s:gui0C        = "89ddff"
+let g:base16_gui0C = "89ddff"
+let s:gui0D        = "82aaff"
+let g:base16_gui0D = "82aaff"
+let s:gui0E        = "c792ea"
+let g:base16_gui0E = "c792ea"
+let s:gui0F        = "ff5370"
+let g:base16_gui0F = "ff5370"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#212121"
-  let g:terminal_color_1 =  "#F07178"
-  let g:terminal_color_2 =  "#C3E88D"
-  let g:terminal_color_3 =  "#FFCB6B"
-  let g:terminal_color_4 =  "#82AAFF"
-  let g:terminal_color_5 =  "#C792EA"
-  let g:terminal_color_6 =  "#89DDFF"
-  let g:terminal_color_7 =  "#EEFFFF"
-  let g:terminal_color_8 =  "#4A4A4A"
-  let g:terminal_color_9 =  "#F07178"
-  let g:terminal_color_10 = "#C3E88D"
-  let g:terminal_color_11 = "#FFCB6B"
-  let g:terminal_color_12 = "#82AAFF"
-  let g:terminal_color_13 = "#C792EA"
-  let g:terminal_color_14 = "#89DDFF"
-  let g:terminal_color_15 = "#FFFFFF"
+  let g:terminal_color_1 =  "#f07178"
+  let g:terminal_color_2 =  "#c3e88d"
+  let g:terminal_color_3 =  "#ffcb6b"
+  let g:terminal_color_4 =  "#82aaff"
+  let g:terminal_color_5 =  "#c792ea"
+  let g:terminal_color_6 =  "#89ddff"
+  let g:terminal_color_7 =  "#eeffff"
+  let g:terminal_color_8 =  "#4a4a4a"
+  let g:terminal_color_9 =  "#f07178"
+  let g:terminal_color_10 = "#c3e88d"
+  let g:terminal_color_11 = "#ffcb6b"
+  let g:terminal_color_12 = "#82aaff"
+  let g:terminal_color_13 = "#c792ea"
+  let g:terminal_color_14 = "#89ddff"
+  let g:terminal_color_15 = "#ffffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#212121",
-        \ "#F07178",
-        \ "#C3E88D",
-        \ "#FFCB6B",
-        \ "#82AAFF",
-        \ "#C792EA",
-        \ "#89DDFF",
-        \ "#EEFFFF",
-        \ "#4A4A4A",
-        \ "#F07178",
-        \ "#C3E88D",
-        \ "#FFCB6B",
-        \ "#82AAFF",
-        \ "#C792EA",
-        \ "#89DDFF",
-        \ "#FFFFFF",
+        \ "#f07178",
+        \ "#c3e88d",
+        \ "#ffcb6b",
+        \ "#82aaff",
+        \ "#c792ea",
+        \ "#89ddff",
+        \ "#eeffff",
+        \ "#4a4a4a",
+        \ "#f07178",
+        \ "#c3e88d",
+        \ "#ffcb6b",
+        \ "#82aaff",
+        \ "#c792ea",
+        \ "#89ddff",
+        \ "#ffffff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim
index 4e31dc7..8fe514c 100644
--- a/colors/base16-material-lighter.vim
+++ b/colors/base16-material-lighter.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "FAFAFA"
-let g:base16_gui00 = "FAFAFA"
-let s:gui01        = "E7EAEC"
-let g:base16_gui01 = "E7EAEC"
-let s:gui02        = "CCEAE7"
-let g:base16_gui02 = "CCEAE7"
-let s:gui03        = "CCD7DA"
-let g:base16_gui03 = "CCD7DA"
-let s:gui04        = "8796B0"
-let g:base16_gui04 = "8796B0"
-let s:gui05        = "80CBC4"
-let g:base16_gui05 = "80CBC4"
-let s:gui06        = "80CBC4"
-let g:base16_gui06 = "80CBC4"
-let s:gui07        = "FFFFFF"
-let g:base16_gui07 = "FFFFFF"
-let s:gui08        = "FF5370"
-let g:base16_gui08 = "FF5370"
-let s:gui09        = "F76D47"
-let g:base16_gui09 = "F76D47"
-let s:gui0A        = "FFB62C"
-let g:base16_gui0A = "FFB62C"
-let s:gui0B        = "91B859"
-let g:base16_gui0B = "91B859"
-let s:gui0C        = "39ADB5"
-let g:base16_gui0C = "39ADB5"
-let s:gui0D        = "6182B8"
-let g:base16_gui0D = "6182B8"
-let s:gui0E        = "7C4DFF"
-let g:base16_gui0E = "7C4DFF"
-let s:gui0F        = "E53935"
-let g:base16_gui0F = "E53935"
+let s:gui00        = "fafafa"
+let g:base16_gui00 = "fafafa"
+let s:gui01        = "e7eaec"
+let g:base16_gui01 = "e7eaec"
+let s:gui02        = "cceae7"
+let g:base16_gui02 = "cceae7"
+let s:gui03        = "ccd7da"
+let g:base16_gui03 = "ccd7da"
+let s:gui04        = "8796b0"
+let g:base16_gui04 = "8796b0"
+let s:gui05        = "80cbc4"
+let g:base16_gui05 = "80cbc4"
+let s:gui06        = "80cbc4"
+let g:base16_gui06 = "80cbc4"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "ff5370"
+let g:base16_gui08 = "ff5370"
+let s:gui09        = "f76d47"
+let g:base16_gui09 = "f76d47"
+let s:gui0A        = "ffb62c"
+let g:base16_gui0A = "ffb62c"
+let s:gui0B        = "91b859"
+let g:base16_gui0B = "91b859"
+let s:gui0C        = "39adb5"
+let g:base16_gui0C = "39adb5"
+let s:gui0D        = "6182b8"
+let g:base16_gui0D = "6182b8"
+let s:gui0E        = "7c4dff"
+let g:base16_gui0E = "7c4dff"
+let s:gui0F        = "e53935"
+let g:base16_gui0F = "e53935"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#FAFAFA"
-  let g:terminal_color_1 =  "#FF5370"
-  let g:terminal_color_2 =  "#91B859"
-  let g:terminal_color_3 =  "#FFB62C"
-  let g:terminal_color_4 =  "#6182B8"
-  let g:terminal_color_5 =  "#7C4DFF"
-  let g:terminal_color_6 =  "#39ADB5"
-  let g:terminal_color_7 =  "#80CBC4"
-  let g:terminal_color_8 =  "#CCD7DA"
-  let g:terminal_color_9 =  "#FF5370"
-  let g:terminal_color_10 = "#91B859"
-  let g:terminal_color_11 = "#FFB62C"
-  let g:terminal_color_12 = "#6182B8"
-  let g:terminal_color_13 = "#7C4DFF"
-  let g:terminal_color_14 = "#39ADB5"
-  let g:terminal_color_15 = "#FFFFFF"
+  let g:terminal_color_0 =  "#fafafa"
+  let g:terminal_color_1 =  "#ff5370"
+  let g:terminal_color_2 =  "#91b859"
+  let g:terminal_color_3 =  "#ffb62c"
+  let g:terminal_color_4 =  "#6182b8"
+  let g:terminal_color_5 =  "#7c4dff"
+  let g:terminal_color_6 =  "#39adb5"
+  let g:terminal_color_7 =  "#80cbc4"
+  let g:terminal_color_8 =  "#ccd7da"
+  let g:terminal_color_9 =  "#ff5370"
+  let g:terminal_color_10 = "#91b859"
+  let g:terminal_color_11 = "#ffb62c"
+  let g:terminal_color_12 = "#6182b8"
+  let g:terminal_color_13 = "#7c4dff"
+  let g:terminal_color_14 = "#39adb5"
+  let g:terminal_color_15 = "#ffffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#FAFAFA",
-        \ "#FF5370",
-        \ "#91B859",
-        \ "#FFB62C",
-        \ "#6182B8",
-        \ "#7C4DFF",
-        \ "#39ADB5",
-        \ "#80CBC4",
-        \ "#CCD7DA",
-        \ "#FF5370",
-        \ "#91B859",
-        \ "#FFB62C",
-        \ "#6182B8",
-        \ "#7C4DFF",
-        \ "#39ADB5",
-        \ "#FFFFFF",
+        \ "#fafafa",
+        \ "#ff5370",
+        \ "#91b859",
+        \ "#ffb62c",
+        \ "#6182b8",
+        \ "#7c4dff",
+        \ "#39adb5",
+        \ "#80cbc4",
+        \ "#ccd7da",
+        \ "#ff5370",
+        \ "#91b859",
+        \ "#ffb62c",
+        \ "#6182b8",
+        \ "#7c4dff",
+        \ "#39adb5",
+        \ "#ffffff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim
index 604a469..77cf65f 100644
--- a/colors/base16-material-palenight.vim
+++ b/colors/base16-material-palenight.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "292D3E"
-let g:base16_gui00 = "292D3E"
+let s:gui00        = "292d3e"
+let g:base16_gui00 = "292d3e"
 let s:gui01        = "444267"
 let g:base16_gui01 = "444267"
-let s:gui02        = "32374D"
-let g:base16_gui02 = "32374D"
-let s:gui03        = "676E95"
-let g:base16_gui03 = "676E95"
-let s:gui04        = "8796B0"
-let g:base16_gui04 = "8796B0"
-let s:gui05        = "959DCB"
-let g:base16_gui05 = "959DCB"
-let s:gui06        = "959DCB"
-let g:base16_gui06 = "959DCB"
-let s:gui07        = "FFFFFF"
-let g:base16_gui07 = "FFFFFF"
-let s:gui08        = "F07178"
-let g:base16_gui08 = "F07178"
-let s:gui09        = "F78C6C"
-let g:base16_gui09 = "F78C6C"
-let s:gui0A        = "FFCB6B"
-let g:base16_gui0A = "FFCB6B"
-let s:gui0B        = "C3E88D"
-let g:base16_gui0B = "C3E88D"
-let s:gui0C        = "89DDFF"
-let g:base16_gui0C = "89DDFF"
-let s:gui0D        = "82AAFF"
-let g:base16_gui0D = "82AAFF"
-let s:gui0E        = "C792EA"
-let g:base16_gui0E = "C792EA"
-let s:gui0F        = "FF5370"
-let g:base16_gui0F = "FF5370"
+let s:gui02        = "32374d"
+let g:base16_gui02 = "32374d"
+let s:gui03        = "676e95"
+let g:base16_gui03 = "676e95"
+let s:gui04        = "8796b0"
+let g:base16_gui04 = "8796b0"
+let s:gui05        = "959dcb"
+let g:base16_gui05 = "959dcb"
+let s:gui06        = "959dcb"
+let g:base16_gui06 = "959dcb"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "f07178"
+let g:base16_gui08 = "f07178"
+let s:gui09        = "f78c6c"
+let g:base16_gui09 = "f78c6c"
+let s:gui0A        = "ffcb6b"
+let g:base16_gui0A = "ffcb6b"
+let s:gui0B        = "c3e88d"
+let g:base16_gui0B = "c3e88d"
+let s:gui0C        = "89ddff"
+let g:base16_gui0C = "89ddff"
+let s:gui0D        = "82aaff"
+let g:base16_gui0D = "82aaff"
+let s:gui0E        = "c792ea"
+let g:base16_gui0E = "c792ea"
+let s:gui0F        = "ff5370"
+let g:base16_gui0F = "ff5370"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#292D3E"
-  let g:terminal_color_1 =  "#F07178"
-  let g:terminal_color_2 =  "#C3E88D"
-  let g:terminal_color_3 =  "#FFCB6B"
-  let g:terminal_color_4 =  "#82AAFF"
-  let g:terminal_color_5 =  "#C792EA"
-  let g:terminal_color_6 =  "#89DDFF"
-  let g:terminal_color_7 =  "#959DCB"
-  let g:terminal_color_8 =  "#676E95"
-  let g:terminal_color_9 =  "#F07178"
-  let g:terminal_color_10 = "#C3E88D"
-  let g:terminal_color_11 = "#FFCB6B"
-  let g:terminal_color_12 = "#82AAFF"
-  let g:terminal_color_13 = "#C792EA"
-  let g:terminal_color_14 = "#89DDFF"
-  let g:terminal_color_15 = "#FFFFFF"
+  let g:terminal_color_0 =  "#292d3e"
+  let g:terminal_color_1 =  "#f07178"
+  let g:terminal_color_2 =  "#c3e88d"
+  let g:terminal_color_3 =  "#ffcb6b"
+  let g:terminal_color_4 =  "#82aaff"
+  let g:terminal_color_5 =  "#c792ea"
+  let g:terminal_color_6 =  "#89ddff"
+  let g:terminal_color_7 =  "#959dcb"
+  let g:terminal_color_8 =  "#676e95"
+  let g:terminal_color_9 =  "#f07178"
+  let g:terminal_color_10 = "#c3e88d"
+  let g:terminal_color_11 = "#ffcb6b"
+  let g:terminal_color_12 = "#82aaff"
+  let g:terminal_color_13 = "#c792ea"
+  let g:terminal_color_14 = "#89ddff"
+  let g:terminal_color_15 = "#ffffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#292D3E",
-        \ "#F07178",
-        \ "#C3E88D",
-        \ "#FFCB6B",
-        \ "#82AAFF",
-        \ "#C792EA",
-        \ "#89DDFF",
-        \ "#959DCB",
-        \ "#676E95",
-        \ "#F07178",
-        \ "#C3E88D",
-        \ "#FFCB6B",
-        \ "#82AAFF",
-        \ "#C792EA",
-        \ "#89DDFF",
-        \ "#FFFFFF",
+        \ "#292d3e",
+        \ "#f07178",
+        \ "#c3e88d",
+        \ "#ffcb6b",
+        \ "#82aaff",
+        \ "#c792ea",
+        \ "#89ddff",
+        \ "#959dcb",
+        \ "#676e95",
+        \ "#f07178",
+        \ "#c3e88d",
+        \ "#ffcb6b",
+        \ "#82aaff",
+        \ "#c792ea",
+        \ "#89ddff",
+        \ "#ffffff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-material-vivid.vim b/colors/base16-material-vivid.vim
index 93802d8..6e24f80 100644
--- a/colors/base16-material-vivid.vim
+++ b/colors/base16-material-vivid.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-material.vim b/colors/base16-material.vim
index 62a6b8c..52a908b 100644
--- a/colors/base16-material.vim
+++ b/colors/base16-material.vim
@@ -17,36 +17,36 @@ endif
 " GUI color definitions
 let s:gui00        = "263238"
 let g:base16_gui00 = "263238"
-let s:gui01        = "2E3C43"
-let g:base16_gui01 = "2E3C43"
+let s:gui01        = "2e3c43"
+let g:base16_gui01 = "2e3c43"
 let s:gui02        = "314549"
 let g:base16_gui02 = "314549"
-let s:gui03        = "546E7A"
-let g:base16_gui03 = "546E7A"
-let s:gui04        = "B2CCD6"
-let g:base16_gui04 = "B2CCD6"
-let s:gui05        = "EEFFFF"
-let g:base16_gui05 = "EEFFFF"
-let s:gui06        = "EEFFFF"
-let g:base16_gui06 = "EEFFFF"
-let s:gui07        = "FFFFFF"
-let g:base16_gui07 = "FFFFFF"
-let s:gui08        = "F07178"
-let g:base16_gui08 = "F07178"
-let s:gui09        = "F78C6C"
-let g:base16_gui09 = "F78C6C"
-let s:gui0A        = "FFCB6B"
-let g:base16_gui0A = "FFCB6B"
-let s:gui0B        = "C3E88D"
-let g:base16_gui0B = "C3E88D"
-let s:gui0C        = "89DDFF"
-let g:base16_gui0C = "89DDFF"
-let s:gui0D        = "82AAFF"
-let g:base16_gui0D = "82AAFF"
-let s:gui0E        = "C792EA"
-let g:base16_gui0E = "C792EA"
-let s:gui0F        = "FF5370"
-let g:base16_gui0F = "FF5370"
+let s:gui03        = "546e7a"
+let g:base16_gui03 = "546e7a"
+let s:gui04        = "b2ccd6"
+let g:base16_gui04 = "b2ccd6"
+let s:gui05        = "eeffff"
+let g:base16_gui05 = "eeffff"
+let s:gui06        = "eeffff"
+let g:base16_gui06 = "eeffff"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "f07178"
+let g:base16_gui08 = "f07178"
+let s:gui09        = "f78c6c"
+let g:base16_gui09 = "f78c6c"
+let s:gui0A        = "ffcb6b"
+let g:base16_gui0A = "ffcb6b"
+let s:gui0B        = "c3e88d"
+let g:base16_gui0B = "c3e88d"
+let s:gui0C        = "89ddff"
+let g:base16_gui0C = "89ddff"
+let s:gui0D        = "82aaff"
+let g:base16_gui0D = "82aaff"
+let s:gui0E        = "c792ea"
+let g:base16_gui0E = "c792ea"
+let s:gui0F        = "ff5370"
+let g:base16_gui0F = "ff5370"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#263238"
-  let g:terminal_color_1 =  "#F07178"
-  let g:terminal_color_2 =  "#C3E88D"
-  let g:terminal_color_3 =  "#FFCB6B"
-  let g:terminal_color_4 =  "#82AAFF"
-  let g:terminal_color_5 =  "#C792EA"
-  let g:terminal_color_6 =  "#89DDFF"
-  let g:terminal_color_7 =  "#EEFFFF"
-  let g:terminal_color_8 =  "#546E7A"
-  let g:terminal_color_9 =  "#F07178"
-  let g:terminal_color_10 = "#C3E88D"
-  let g:terminal_color_11 = "#FFCB6B"
-  let g:terminal_color_12 = "#82AAFF"
-  let g:terminal_color_13 = "#C792EA"
-  let g:terminal_color_14 = "#89DDFF"
-  let g:terminal_color_15 = "#FFFFFF"
+  let g:terminal_color_1 =  "#f07178"
+  let g:terminal_color_2 =  "#c3e88d"
+  let g:terminal_color_3 =  "#ffcb6b"
+  let g:terminal_color_4 =  "#82aaff"
+  let g:terminal_color_5 =  "#c792ea"
+  let g:terminal_color_6 =  "#89ddff"
+  let g:terminal_color_7 =  "#eeffff"
+  let g:terminal_color_8 =  "#546e7a"
+  let g:terminal_color_9 =  "#f07178"
+  let g:terminal_color_10 = "#c3e88d"
+  let g:terminal_color_11 = "#ffcb6b"
+  let g:terminal_color_12 = "#82aaff"
+  let g:terminal_color_13 = "#c792ea"
+  let g:terminal_color_14 = "#89ddff"
+  let g:terminal_color_15 = "#ffffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#263238",
-        \ "#F07178",
-        \ "#C3E88D",
-        \ "#FFCB6B",
-        \ "#82AAFF",
-        \ "#C792EA",
-        \ "#89DDFF",
-        \ "#EEFFFF",
-        \ "#546E7A",
-        \ "#F07178",
-        \ "#C3E88D",
-        \ "#FFCB6B",
-        \ "#82AAFF",
-        \ "#C792EA",
-        \ "#89DDFF",
-        \ "#FFFFFF",
+        \ "#f07178",
+        \ "#c3e88d",
+        \ "#ffcb6b",
+        \ "#82aaff",
+        \ "#c792ea",
+        \ "#89ddff",
+        \ "#eeffff",
+        \ "#546e7a",
+        \ "#f07178",
+        \ "#c3e88d",
+        \ "#ffcb6b",
+        \ "#82aaff",
+        \ "#c792ea",
+        \ "#89ddff",
+        \ "#ffffff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim
index 2c5dc89..ced0105 100644
--- a/colors/base16-mellow-purple.vim
+++ b/colors/base16-mellow-purple.vim
@@ -17,8 +17,8 @@ endif
 " GUI color definitions
 let s:gui00        = "1e0528"
 let g:base16_gui00 = "1e0528"
-let s:gui01        = "1A092D"
-let g:base16_gui01 = "1A092D"
+let s:gui01        = "1a092d"
+let g:base16_gui01 = "1a092d"
 let s:gui02        = "331354"
 let g:base16_gui02 = "331354"
 let s:gui03        = "320f55"
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim
index 84248f3..8d3b90e 100644
--- a/colors/base16-mexico-light.vim
+++ b/colors/base16-mexico-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 7660970..2916231 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -15,8 +15,8 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "3B3228"
-let g:base16_gui00 = "3B3228"
+let s:gui00        = "3b3228"
+let g:base16_gui00 = "3b3228"
 let s:gui01        = "534636"
 let g:base16_gui01 = "534636"
 let s:gui02        = "645240"
@@ -99,7 +99,7 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#3B3228"
+  let g:terminal_color_0 =  "#3b3228"
   let g:terminal_color_1 =  "#cb6077"
   let g:terminal_color_2 =  "#beb55b"
   let g:terminal_color_3 =  "#f4bc87"
@@ -123,7 +123,7 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#3B3228",
+        \ "#3b3228",
         \ "#cb6077",
         \ "#beb55b",
         \ "#f4bc87",
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index f9f804a..c6c601e 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-nebula.vim b/colors/base16-nebula.vim
index 9d799e4..c123841 100644
--- a/colors/base16-nebula.vim
+++ b/colors/base16-nebula.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim
index 764fb20..7d78cfa 100644
--- a/colors/base16-nord.vim
+++ b/colors/base16-nord.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "2E3440"
-let g:base16_gui00 = "2E3440"
-let s:gui01        = "3B4252"
-let g:base16_gui01 = "3B4252"
-let s:gui02        = "434C5E"
-let g:base16_gui02 = "434C5E"
-let s:gui03        = "4C566A"
-let g:base16_gui03 = "4C566A"
-let s:gui04        = "D8DEE9"
-let g:base16_gui04 = "D8DEE9"
-let s:gui05        = "E5E9F0"
-let g:base16_gui05 = "E5E9F0"
-let s:gui06        = "ECEFF4"
-let g:base16_gui06 = "ECEFF4"
-let s:gui07        = "8FBCBB"
-let g:base16_gui07 = "8FBCBB"
-let s:gui08        = "BF616A"
-let g:base16_gui08 = "BF616A"
-let s:gui09        = "D08770"
-let g:base16_gui09 = "D08770"
-let s:gui0A        = "EBCB8B"
-let g:base16_gui0A = "EBCB8B"
-let s:gui0B        = "A3BE8C"
-let g:base16_gui0B = "A3BE8C"
-let s:gui0C        = "88C0D0"
-let g:base16_gui0C = "88C0D0"
-let s:gui0D        = "81A1C1"
-let g:base16_gui0D = "81A1C1"
-let s:gui0E        = "B48EAD"
-let g:base16_gui0E = "B48EAD"
-let s:gui0F        = "5E81AC"
-let g:base16_gui0F = "5E81AC"
+let s:gui00        = "2e3440"
+let g:base16_gui00 = "2e3440"
+let s:gui01        = "3b4252"
+let g:base16_gui01 = "3b4252"
+let s:gui02        = "434c5e"
+let g:base16_gui02 = "434c5e"
+let s:gui03        = "4c566a"
+let g:base16_gui03 = "4c566a"
+let s:gui04        = "d8dee9"
+let g:base16_gui04 = "d8dee9"
+let s:gui05        = "e5e9f0"
+let g:base16_gui05 = "e5e9f0"
+let s:gui06        = "eceff4"
+let g:base16_gui06 = "eceff4"
+let s:gui07        = "8fbcbb"
+let g:base16_gui07 = "8fbcbb"
+let s:gui08        = "bf616a"
+let g:base16_gui08 = "bf616a"
+let s:gui09        = "d08770"
+let g:base16_gui09 = "d08770"
+let s:gui0A        = "ebcb8b"
+let g:base16_gui0A = "ebcb8b"
+let s:gui0B        = "a3be8c"
+let g:base16_gui0B = "a3be8c"
+let s:gui0C        = "88c0d0"
+let g:base16_gui0C = "88c0d0"
+let s:gui0D        = "81a1c1"
+let g:base16_gui0D = "81a1c1"
+let s:gui0E        = "b48ead"
+let g:base16_gui0E = "b48ead"
+let s:gui0F        = "5e81ac"
+let g:base16_gui0F = "5e81ac"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#2E3440"
-  let g:terminal_color_1 =  "#BF616A"
-  let g:terminal_color_2 =  "#A3BE8C"
-  let g:terminal_color_3 =  "#EBCB8B"
-  let g:terminal_color_4 =  "#81A1C1"
-  let g:terminal_color_5 =  "#B48EAD"
-  let g:terminal_color_6 =  "#88C0D0"
-  let g:terminal_color_7 =  "#E5E9F0"
-  let g:terminal_color_8 =  "#4C566A"
-  let g:terminal_color_9 =  "#BF616A"
-  let g:terminal_color_10 = "#A3BE8C"
-  let g:terminal_color_11 = "#EBCB8B"
-  let g:terminal_color_12 = "#81A1C1"
-  let g:terminal_color_13 = "#B48EAD"
-  let g:terminal_color_14 = "#88C0D0"
-  let g:terminal_color_15 = "#8FBCBB"
+  let g:terminal_color_0 =  "#2e3440"
+  let g:terminal_color_1 =  "#bf616a"
+  let g:terminal_color_2 =  "#a3be8c"
+  let g:terminal_color_3 =  "#ebcb8b"
+  let g:terminal_color_4 =  "#81a1c1"
+  let g:terminal_color_5 =  "#b48ead"
+  let g:terminal_color_6 =  "#88c0d0"
+  let g:terminal_color_7 =  "#e5e9f0"
+  let g:terminal_color_8 =  "#4c566a"
+  let g:terminal_color_9 =  "#bf616a"
+  let g:terminal_color_10 = "#a3be8c"
+  let g:terminal_color_11 = "#ebcb8b"
+  let g:terminal_color_12 = "#81a1c1"
+  let g:terminal_color_13 = "#b48ead"
+  let g:terminal_color_14 = "#88c0d0"
+  let g:terminal_color_15 = "#8fbcbb"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#2E3440",
-        \ "#BF616A",
-        \ "#A3BE8C",
-        \ "#EBCB8B",
-        \ "#81A1C1",
-        \ "#B48EAD",
-        \ "#88C0D0",
-        \ "#E5E9F0",
-        \ "#4C566A",
-        \ "#BF616A",
-        \ "#A3BE8C",
-        \ "#EBCB8B",
-        \ "#81A1C1",
-        \ "#B48EAD",
-        \ "#88C0D0",
-        \ "#8FBCBB",
+        \ "#2e3440",
+        \ "#bf616a",
+        \ "#a3be8c",
+        \ "#ebcb8b",
+        \ "#81a1c1",
+        \ "#b48ead",
+        \ "#88c0d0",
+        \ "#e5e9f0",
+        \ "#4c566a",
+        \ "#bf616a",
+        \ "#a3be8c",
+        \ "#ebcb8b",
+        \ "#81a1c1",
+        \ "#b48ead",
+        \ "#88c0d0",
+        \ "#8fbcbb",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-nova.vim b/colors/base16-nova.vim
index 7aed6c5..795c5ad 100644
--- a/colors/base16-nova.vim
+++ b/colors/base16-nova.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "3C4C55"
-let g:base16_gui00 = "3C4C55"
+let s:gui00        = "3c4c55"
+let g:base16_gui00 = "3c4c55"
 let s:gui01        = "556873"
 let g:base16_gui01 = "556873"
-let s:gui02        = "6A7D89"
-let g:base16_gui02 = "6A7D89"
-let s:gui03        = "899BA6"
-let g:base16_gui03 = "899BA6"
-let s:gui04        = "899BA6"
-let g:base16_gui04 = "899BA6"
-let s:gui05        = "C5D4DD"
-let g:base16_gui05 = "C5D4DD"
-let s:gui06        = "899BA6"
-let g:base16_gui06 = "899BA6"
+let s:gui02        = "6a7d89"
+let g:base16_gui02 = "6a7d89"
+let s:gui03        = "899ba6"
+let g:base16_gui03 = "899ba6"
+let s:gui04        = "899ba6"
+let g:base16_gui04 = "899ba6"
+let s:gui05        = "c5d4dd"
+let g:base16_gui05 = "c5d4dd"
+let s:gui06        = "899ba6"
+let g:base16_gui06 = "899ba6"
 let s:gui07        = "556873"
 let g:base16_gui07 = "556873"
-let s:gui08        = "83AFE5"
-let g:base16_gui08 = "83AFE5"
-let s:gui09        = "7FC1CA"
-let g:base16_gui09 = "7FC1CA"
-let s:gui0A        = "A8CE93"
-let g:base16_gui0A = "A8CE93"
-let s:gui0B        = "7FC1CA"
-let g:base16_gui0B = "7FC1CA"
-let s:gui0C        = "F2C38F"
-let g:base16_gui0C = "F2C38F"
-let s:gui0D        = "83AFE5"
-let g:base16_gui0D = "83AFE5"
-let s:gui0E        = "9A93E1"
-let g:base16_gui0E = "9A93E1"
-let s:gui0F        = "F2C38F"
-let g:base16_gui0F = "F2C38F"
+let s:gui08        = "83afe5"
+let g:base16_gui08 = "83afe5"
+let s:gui09        = "7fc1ca"
+let g:base16_gui09 = "7fc1ca"
+let s:gui0A        = "a8ce93"
+let g:base16_gui0A = "a8ce93"
+let s:gui0B        = "7fc1ca"
+let g:base16_gui0B = "7fc1ca"
+let s:gui0C        = "f2c38f"
+let g:base16_gui0C = "f2c38f"
+let s:gui0D        = "83afe5"
+let g:base16_gui0D = "83afe5"
+let s:gui0E        = "9a93e1"
+let g:base16_gui0E = "9a93e1"
+let s:gui0F        = "f2c38f"
+let g:base16_gui0F = "f2c38f"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,21 +99,21 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#3C4C55"
-  let g:terminal_color_1 =  "#83AFE5"
-  let g:terminal_color_2 =  "#7FC1CA"
-  let g:terminal_color_3 =  "#A8CE93"
-  let g:terminal_color_4 =  "#83AFE5"
-  let g:terminal_color_5 =  "#9A93E1"
-  let g:terminal_color_6 =  "#F2C38F"
-  let g:terminal_color_7 =  "#C5D4DD"
-  let g:terminal_color_8 =  "#899BA6"
-  let g:terminal_color_9 =  "#83AFE5"
-  let g:terminal_color_10 = "#7FC1CA"
-  let g:terminal_color_11 = "#A8CE93"
-  let g:terminal_color_12 = "#83AFE5"
-  let g:terminal_color_13 = "#9A93E1"
-  let g:terminal_color_14 = "#F2C38F"
+  let g:terminal_color_0 =  "#3c4c55"
+  let g:terminal_color_1 =  "#83afe5"
+  let g:terminal_color_2 =  "#7fc1ca"
+  let g:terminal_color_3 =  "#a8ce93"
+  let g:terminal_color_4 =  "#83afe5"
+  let g:terminal_color_5 =  "#9a93e1"
+  let g:terminal_color_6 =  "#f2c38f"
+  let g:terminal_color_7 =  "#c5d4dd"
+  let g:terminal_color_8 =  "#899ba6"
+  let g:terminal_color_9 =  "#83afe5"
+  let g:terminal_color_10 = "#7fc1ca"
+  let g:terminal_color_11 = "#a8ce93"
+  let g:terminal_color_12 = "#83afe5"
+  let g:terminal_color_13 = "#9a93e1"
+  let g:terminal_color_14 = "#f2c38f"
   let g:terminal_color_15 = "#556873"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -123,21 +123,21 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#3C4C55",
-        \ "#83AFE5",
-        \ "#7FC1CA",
-        \ "#A8CE93",
-        \ "#83AFE5",
-        \ "#9A93E1",
-        \ "#F2C38F",
-        \ "#C5D4DD",
-        \ "#899BA6",
-        \ "#83AFE5",
-        \ "#7FC1CA",
-        \ "#A8CE93",
-        \ "#83AFE5",
-        \ "#9A93E1",
-        \ "#F2C38F",
+        \ "#3c4c55",
+        \ "#83afe5",
+        \ "#7fc1ca",
+        \ "#a8ce93",
+        \ "#83afe5",
+        \ "#9a93e1",
+        \ "#f2c38f",
+        \ "#c5d4dd",
+        \ "#899ba6",
+        \ "#83afe5",
+        \ "#7fc1ca",
+        \ "#a8ce93",
+        \ "#83afe5",
+        \ "#9a93e1",
+        \ "#f2c38f",
         \ "#556873",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index b740778..beb56cb 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim
index 0c7ef27..2875769 100644
--- a/colors/base16-oceanicnext.vim
+++ b/colors/base16-oceanicnext.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "1B2B34"
-let g:base16_gui00 = "1B2B34"
-let s:gui01        = "343D46"
-let g:base16_gui01 = "343D46"
-let s:gui02        = "4F5B66"
-let g:base16_gui02 = "4F5B66"
-let s:gui03        = "65737E"
-let g:base16_gui03 = "65737E"
-let s:gui04        = "A7ADBA"
-let g:base16_gui04 = "A7ADBA"
-let s:gui05        = "C0C5CE"
-let g:base16_gui05 = "C0C5CE"
-let s:gui06        = "CDD3DE"
-let g:base16_gui06 = "CDD3DE"
-let s:gui07        = "D8DEE9"
-let g:base16_gui07 = "D8DEE9"
-let s:gui08        = "EC5f67"
-let g:base16_gui08 = "EC5f67"
-let s:gui09        = "F99157"
-let g:base16_gui09 = "F99157"
-let s:gui0A        = "FAC863"
-let g:base16_gui0A = "FAC863"
-let s:gui0B        = "99C794"
-let g:base16_gui0B = "99C794"
-let s:gui0C        = "5FB3B3"
-let g:base16_gui0C = "5FB3B3"
-let s:gui0D        = "6699CC"
-let g:base16_gui0D = "6699CC"
-let s:gui0E        = "C594C5"
-let g:base16_gui0E = "C594C5"
-let s:gui0F        = "AB7967"
-let g:base16_gui0F = "AB7967"
+let s:gui00        = "1b2b34"
+let g:base16_gui00 = "1b2b34"
+let s:gui01        = "343d46"
+let g:base16_gui01 = "343d46"
+let s:gui02        = "4f5b66"
+let g:base16_gui02 = "4f5b66"
+let s:gui03        = "65737e"
+let g:base16_gui03 = "65737e"
+let s:gui04        = "a7adba"
+let g:base16_gui04 = "a7adba"
+let s:gui05        = "c0c5ce"
+let g:base16_gui05 = "c0c5ce"
+let s:gui06        = "cdd3de"
+let g:base16_gui06 = "cdd3de"
+let s:gui07        = "d8dee9"
+let g:base16_gui07 = "d8dee9"
+let s:gui08        = "ec5f67"
+let g:base16_gui08 = "ec5f67"
+let s:gui09        = "f99157"
+let g:base16_gui09 = "f99157"
+let s:gui0A        = "fac863"
+let g:base16_gui0A = "fac863"
+let s:gui0B        = "99c794"
+let g:base16_gui0B = "99c794"
+let s:gui0C        = "5fb3b3"
+let g:base16_gui0C = "5fb3b3"
+let s:gui0D        = "6699cc"
+let g:base16_gui0D = "6699cc"
+let s:gui0E        = "c594c5"
+let g:base16_gui0E = "c594c5"
+let s:gui0F        = "ab7967"
+let g:base16_gui0F = "ab7967"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#1B2B34"
-  let g:terminal_color_1 =  "#EC5f67"
-  let g:terminal_color_2 =  "#99C794"
-  let g:terminal_color_3 =  "#FAC863"
-  let g:terminal_color_4 =  "#6699CC"
-  let g:terminal_color_5 =  "#C594C5"
-  let g:terminal_color_6 =  "#5FB3B3"
-  let g:terminal_color_7 =  "#C0C5CE"
-  let g:terminal_color_8 =  "#65737E"
-  let g:terminal_color_9 =  "#EC5f67"
-  let g:terminal_color_10 = "#99C794"
-  let g:terminal_color_11 = "#FAC863"
-  let g:terminal_color_12 = "#6699CC"
-  let g:terminal_color_13 = "#C594C5"
-  let g:terminal_color_14 = "#5FB3B3"
-  let g:terminal_color_15 = "#D8DEE9"
+  let g:terminal_color_0 =  "#1b2b34"
+  let g:terminal_color_1 =  "#ec5f67"
+  let g:terminal_color_2 =  "#99c794"
+  let g:terminal_color_3 =  "#fac863"
+  let g:terminal_color_4 =  "#6699cc"
+  let g:terminal_color_5 =  "#c594c5"
+  let g:terminal_color_6 =  "#5fb3b3"
+  let g:terminal_color_7 =  "#c0c5ce"
+  let g:terminal_color_8 =  "#65737e"
+  let g:terminal_color_9 =  "#ec5f67"
+  let g:terminal_color_10 = "#99c794"
+  let g:terminal_color_11 = "#fac863"
+  let g:terminal_color_12 = "#6699cc"
+  let g:terminal_color_13 = "#c594c5"
+  let g:terminal_color_14 = "#5fb3b3"
+  let g:terminal_color_15 = "#d8dee9"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#1B2B34",
-        \ "#EC5f67",
-        \ "#99C794",
-        \ "#FAC863",
-        \ "#6699CC",
-        \ "#C594C5",
-        \ "#5FB3B3",
-        \ "#C0C5CE",
-        \ "#65737E",
-        \ "#EC5f67",
-        \ "#99C794",
-        \ "#FAC863",
-        \ "#6699CC",
-        \ "#C594C5",
-        \ "#5FB3B3",
-        \ "#D8DEE9",
+        \ "#1b2b34",
+        \ "#ec5f67",
+        \ "#99c794",
+        \ "#fac863",
+        \ "#6699cc",
+        \ "#c594c5",
+        \ "#5fb3b3",
+        \ "#c0c5ce",
+        \ "#65737e",
+        \ "#ec5f67",
+        \ "#99c794",
+        \ "#fac863",
+        \ "#6699cc",
+        \ "#c594c5",
+        \ "#5fb3b3",
+        \ "#d8dee9",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim
index 92fa733..072a055 100644
--- a/colors/base16-one-light.vim
+++ b/colors/base16-one-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim
index 5109dcb..3edf6fe 100644
--- a/colors/base16-onedark.vim
+++ b/colors/base16-onedark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-outrun-dark.vim b/colors/base16-outrun-dark.vim
index b8e2040..a90053a 100644
--- a/colors/base16-outrun-dark.vim
+++ b/colors/base16-outrun-dark.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "00002A"
-let g:base16_gui00 = "00002A"
-let s:gui01        = "20204A"
-let g:base16_gui01 = "20204A"
-let s:gui02        = "30305A"
-let g:base16_gui02 = "30305A"
-let s:gui03        = "50507A"
-let g:base16_gui03 = "50507A"
-let s:gui04        = "B0B0DA"
-let g:base16_gui04 = "B0B0DA"
-let s:gui05        = "D0D0FA"
-let g:base16_gui05 = "D0D0FA"
-let s:gui06        = "E0E0FF"
-let g:base16_gui06 = "E0E0FF"
-let s:gui07        = "F5F5FF"
-let g:base16_gui07 = "F5F5FF"
-let s:gui08        = "FF4242"
-let g:base16_gui08 = "FF4242"
-let s:gui09        = "FC8D28"
-let g:base16_gui09 = "FC8D28"
-let s:gui0A        = "F3E877"
-let g:base16_gui0A = "F3E877"
-let s:gui0B        = "59F176"
-let g:base16_gui0B = "59F176"
-let s:gui0C        = "0EF0F0"
-let g:base16_gui0C = "0EF0F0"
-let s:gui0D        = "66B0FF"
-let g:base16_gui0D = "66B0FF"
-let s:gui0E        = "F10596"
-let g:base16_gui0E = "F10596"
-let s:gui0F        = "F003EF"
-let g:base16_gui0F = "F003EF"
+let s:gui00        = "00002a"
+let g:base16_gui00 = "00002a"
+let s:gui01        = "20204a"
+let g:base16_gui01 = "20204a"
+let s:gui02        = "30305a"
+let g:base16_gui02 = "30305a"
+let s:gui03        = "50507a"
+let g:base16_gui03 = "50507a"
+let s:gui04        = "b0b0da"
+let g:base16_gui04 = "b0b0da"
+let s:gui05        = "d0d0fa"
+let g:base16_gui05 = "d0d0fa"
+let s:gui06        = "e0e0ff"
+let g:base16_gui06 = "e0e0ff"
+let s:gui07        = "f5f5ff"
+let g:base16_gui07 = "f5f5ff"
+let s:gui08        = "ff4242"
+let g:base16_gui08 = "ff4242"
+let s:gui09        = "fc8d28"
+let g:base16_gui09 = "fc8d28"
+let s:gui0A        = "f3e877"
+let g:base16_gui0A = "f3e877"
+let s:gui0B        = "59f176"
+let g:base16_gui0B = "59f176"
+let s:gui0C        = "0ef0f0"
+let g:base16_gui0C = "0ef0f0"
+let s:gui0D        = "66b0ff"
+let g:base16_gui0D = "66b0ff"
+let s:gui0E        = "f10596"
+let g:base16_gui0E = "f10596"
+let s:gui0F        = "f003ef"
+let g:base16_gui0F = "f003ef"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#00002A"
-  let g:terminal_color_1 =  "#FF4242"
-  let g:terminal_color_2 =  "#59F176"
-  let g:terminal_color_3 =  "#F3E877"
-  let g:terminal_color_4 =  "#66B0FF"
-  let g:terminal_color_5 =  "#F10596"
-  let g:terminal_color_6 =  "#0EF0F0"
-  let g:terminal_color_7 =  "#D0D0FA"
-  let g:terminal_color_8 =  "#50507A"
-  let g:terminal_color_9 =  "#FF4242"
-  let g:terminal_color_10 = "#59F176"
-  let g:terminal_color_11 = "#F3E877"
-  let g:terminal_color_12 = "#66B0FF"
-  let g:terminal_color_13 = "#F10596"
-  let g:terminal_color_14 = "#0EF0F0"
-  let g:terminal_color_15 = "#F5F5FF"
+  let g:terminal_color_0 =  "#00002a"
+  let g:terminal_color_1 =  "#ff4242"
+  let g:terminal_color_2 =  "#59f176"
+  let g:terminal_color_3 =  "#f3e877"
+  let g:terminal_color_4 =  "#66b0ff"
+  let g:terminal_color_5 =  "#f10596"
+  let g:terminal_color_6 =  "#0ef0f0"
+  let g:terminal_color_7 =  "#d0d0fa"
+  let g:terminal_color_8 =  "#50507a"
+  let g:terminal_color_9 =  "#ff4242"
+  let g:terminal_color_10 = "#59f176"
+  let g:terminal_color_11 = "#f3e877"
+  let g:terminal_color_12 = "#66b0ff"
+  let g:terminal_color_13 = "#f10596"
+  let g:terminal_color_14 = "#0ef0f0"
+  let g:terminal_color_15 = "#f5f5ff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#00002A",
-        \ "#FF4242",
-        \ "#59F176",
-        \ "#F3E877",
-        \ "#66B0FF",
-        \ "#F10596",
-        \ "#0EF0F0",
-        \ "#D0D0FA",
-        \ "#50507A",
-        \ "#FF4242",
-        \ "#59F176",
-        \ "#F3E877",
-        \ "#66B0FF",
-        \ "#F10596",
-        \ "#0EF0F0",
-        \ "#F5F5FF",
+        \ "#00002a",
+        \ "#ff4242",
+        \ "#59f176",
+        \ "#f3e877",
+        \ "#66b0ff",
+        \ "#f10596",
+        \ "#0ef0f0",
+        \ "#d0d0fa",
+        \ "#50507a",
+        \ "#ff4242",
+        \ "#59f176",
+        \ "#f3e877",
+        \ "#66b0ff",
+        \ "#f10596",
+        \ "#0ef0f0",
+        \ "#f5f5ff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-pandora.vim b/colors/base16-pandora.vim
new file mode 100644
index 0000000..9d1de2b
--- /dev/null
+++ b/colors/base16-pandora.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" pandora scheme by Cassandra Fox
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-pandora.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "131213"
+let g:base16_gui00 = "131213"
+let s:gui01        = "2f1823"
+let g:base16_gui01 = "2f1823"
+let s:gui02        = "472234"
+let g:base16_gui02 = "472234"
+let s:gui03        = "ffbee3"
+let g:base16_gui03 = "ffbee3"
+let s:gui04        = "9b2a46"
+let g:base16_gui04 = "9b2a46"
+let s:gui05        = "f15c99"
+let g:base16_gui05 = "f15c99"
+let s:gui06        = "81506a"
+let g:base16_gui06 = "81506a"
+let s:gui07        = "632227"
+let g:base16_gui07 = "632227"
+let s:gui08        = "b00b69"
+let g:base16_gui08 = "b00b69"
+let s:gui09        = "ff9153"
+let g:base16_gui09 = "ff9153"
+let s:gui0A        = "ffcc00"
+let g:base16_gui0A = "ffcc00"
+let s:gui0B        = "9ddf69"
+let g:base16_gui0B = "9ddf69"
+let s:gui0C        = "714ca6"
+let g:base16_gui0C = "714ca6"
+let s:gui0D        = "008080"
+let g:base16_gui0D = "008080"
+let s:gui0E        = "a24030"
+let g:base16_gui0E = "a24030"
+let s:gui0F        = "a24030"
+let g:base16_gui0F = "a24030"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#131213"
+  let g:terminal_color_1 =  "#b00b69"
+  let g:terminal_color_2 =  "#9ddf69"
+  let g:terminal_color_3 =  "#ffcc00"
+  let g:terminal_color_4 =  "#008080"
+  let g:terminal_color_5 =  "#a24030"
+  let g:terminal_color_6 =  "#714ca6"
+  let g:terminal_color_7 =  "#f15c99"
+  let g:terminal_color_8 =  "#ffbee3"
+  let g:terminal_color_9 =  "#b00b69"
+  let g:terminal_color_10 = "#9ddf69"
+  let g:terminal_color_11 = "#ffcc00"
+  let g:terminal_color_12 = "#008080"
+  let g:terminal_color_13 = "#a24030"
+  let g:terminal_color_14 = "#714ca6"
+  let g:terminal_color_15 = "#632227"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#131213",
+        \ "#b00b69",
+        \ "#9ddf69",
+        \ "#ffcc00",
+        \ "#008080",
+        \ "#a24030",
+        \ "#714ca6",
+        \ "#f15c99",
+        \ "#ffbee3",
+        \ "#b00b69",
+        \ "#9ddf69",
+        \ "#ffcc00",
+        \ "#008080",
+        \ "#a24030",
+        \ "#714ca6",
+        \ "#632227",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-pandora"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-papercolor-dark.vim b/colors/base16-papercolor-dark.vim
index 3e2e82f..c3ff491 100644
--- a/colors/base16-papercolor-dark.vim
+++ b/colors/base16-papercolor-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-papercolor-light.vim b/colors/base16-papercolor-light.vim
index c55db05..ae8493c 100644
--- a/colors/base16-papercolor-light.vim
+++ b/colors/base16-papercolor-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index dc0227c..d368ecf 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-pasque.vim b/colors/base16-pasque.vim
index a8b7c80..db1dbe6 100644
--- a/colors/base16-pasque.vim
+++ b/colors/base16-pasque.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "271C3A"
-let g:base16_gui00 = "271C3A"
+let s:gui00        = "271c3a"
+let g:base16_gui00 = "271c3a"
 let s:gui01        = "100323"
 let g:base16_gui01 = "100323"
-let s:gui02        = "3E2D5C"
-let g:base16_gui02 = "3E2D5C"
-let s:gui03        = "5D5766"
-let g:base16_gui03 = "5D5766"
-let s:gui04        = "BEBCBF"
-let g:base16_gui04 = "BEBCBF"
-let s:gui05        = "DEDCDF"
-let g:base16_gui05 = "DEDCDF"
-let s:gui06        = "EDEAEF"
-let g:base16_gui06 = "EDEAEF"
-let s:gui07        = "BBAADD"
-let g:base16_gui07 = "BBAADD"
-let s:gui08        = "A92258"
-let g:base16_gui08 = "A92258"
+let s:gui02        = "3e2d5c"
+let g:base16_gui02 = "3e2d5c"
+let s:gui03        = "5d5766"
+let g:base16_gui03 = "5d5766"
+let s:gui04        = "bebcbf"
+let g:base16_gui04 = "bebcbf"
+let s:gui05        = "dedcdf"
+let g:base16_gui05 = "dedcdf"
+let s:gui06        = "edeaef"
+let g:base16_gui06 = "edeaef"
+let s:gui07        = "bbaadd"
+let g:base16_gui07 = "bbaadd"
+let s:gui08        = "a92258"
+let g:base16_gui08 = "a92258"
 let s:gui09        = "918889"
 let g:base16_gui09 = "918889"
 let s:gui0A        = "804ead"
 let g:base16_gui0A = "804ead"
-let s:gui0B        = "C6914B"
-let g:base16_gui0B = "C6914B"
-let s:gui0C        = "7263AA"
-let g:base16_gui0C = "7263AA"
-let s:gui0D        = "8E7DC6"
-let g:base16_gui0D = "8E7DC6"
-let s:gui0E        = "953B9D"
-let g:base16_gui0E = "953B9D"
-let s:gui0F        = "59325C"
-let g:base16_gui0F = "59325C"
+let s:gui0B        = "c6914b"
+let g:base16_gui0B = "c6914b"
+let s:gui0C        = "7263aa"
+let g:base16_gui0C = "7263aa"
+let s:gui0D        = "8e7dc6"
+let g:base16_gui0D = "8e7dc6"
+let s:gui0E        = "953b9d"
+let g:base16_gui0E = "953b9d"
+let s:gui0F        = "59325c"
+let g:base16_gui0F = "59325c"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#271C3A"
-  let g:terminal_color_1 =  "#A92258"
-  let g:terminal_color_2 =  "#C6914B"
+  let g:terminal_color_0 =  "#271c3a"
+  let g:terminal_color_1 =  "#a92258"
+  let g:terminal_color_2 =  "#c6914b"
   let g:terminal_color_3 =  "#804ead"
-  let g:terminal_color_4 =  "#8E7DC6"
-  let g:terminal_color_5 =  "#953B9D"
-  let g:terminal_color_6 =  "#7263AA"
-  let g:terminal_color_7 =  "#DEDCDF"
-  let g:terminal_color_8 =  "#5D5766"
-  let g:terminal_color_9 =  "#A92258"
-  let g:terminal_color_10 = "#C6914B"
+  let g:terminal_color_4 =  "#8e7dc6"
+  let g:terminal_color_5 =  "#953b9d"
+  let g:terminal_color_6 =  "#7263aa"
+  let g:terminal_color_7 =  "#dedcdf"
+  let g:terminal_color_8 =  "#5d5766"
+  let g:terminal_color_9 =  "#a92258"
+  let g:terminal_color_10 = "#c6914b"
   let g:terminal_color_11 = "#804ead"
-  let g:terminal_color_12 = "#8E7DC6"
-  let g:terminal_color_13 = "#953B9D"
-  let g:terminal_color_14 = "#7263AA"
-  let g:terminal_color_15 = "#BBAADD"
+  let g:terminal_color_12 = "#8e7dc6"
+  let g:terminal_color_13 = "#953b9d"
+  let g:terminal_color_14 = "#7263aa"
+  let g:terminal_color_15 = "#bbaadd"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#271C3A",
-        \ "#A92258",
-        \ "#C6914B",
+        \ "#271c3a",
+        \ "#a92258",
+        \ "#c6914b",
         \ "#804ead",
-        \ "#8E7DC6",
-        \ "#953B9D",
-        \ "#7263AA",
-        \ "#DEDCDF",
-        \ "#5D5766",
-        \ "#A92258",
-        \ "#C6914B",
+        \ "#8e7dc6",
+        \ "#953b9d",
+        \ "#7263aa",
+        \ "#dedcdf",
+        \ "#5d5766",
+        \ "#a92258",
+        \ "#c6914b",
         \ "#804ead",
-        \ "#8E7DC6",
-        \ "#953B9D",
-        \ "#7263AA",
-        \ "#BBAADD",
+        \ "#8e7dc6",
+        \ "#953b9d",
+        \ "#7263aa",
+        \ "#bbaadd",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim
index 4edc516..d31d92a 100644
--- a/colors/base16-phd.vim
+++ b/colors/base16-phd.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim
index f4a77fe..b5566f3 100644
--- a/colors/base16-pico.vim
+++ b/colors/base16-pico.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-pinky.vim b/colors/base16-pinky.vim
index 67fcc4a..3a2efb0 100644
--- a/colors/base16-pinky.vim
+++ b/colors/base16-pinky.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim
index 72d497a..942982f 100644
--- a/colors/base16-pop.vim
+++ b/colors/base16-pop.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim
index 80eab61..c4259b1 100644
--- a/colors/base16-porple.vim
+++ b/colors/base16-porple.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-primer-dark-dimmed.vim b/colors/base16-primer-dark-dimmed.vim
new file mode 100644
index 0000000..e885ab5
--- /dev/null
+++ b/colors/base16-primer-dark-dimmed.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Primer Dark Dimmed scheme by Jimmy Lin
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-primer-dark-dimmed.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "1c2128"
+let g:base16_gui00 = "1c2128"
+let s:gui01        = "373e47"
+let g:base16_gui01 = "373e47"
+let s:gui02        = "444c56"
+let g:base16_gui02 = "444c56"
+let s:gui03        = "545d68"
+let g:base16_gui03 = "545d68"
+let s:gui04        = "768390"
+let g:base16_gui04 = "768390"
+let s:gui05        = "909dab"
+let g:base16_gui05 = "909dab"
+let s:gui06        = "adbac7"
+let g:base16_gui06 = "adbac7"
+let s:gui07        = "cdd9e5"
+let g:base16_gui07 = "cdd9e5"
+let s:gui08        = "f47067"
+let g:base16_gui08 = "f47067"
+let s:gui09        = "e0823d"
+let g:base16_gui09 = "e0823d"
+let s:gui0A        = "c69026"
+let g:base16_gui0A = "c69026"
+let s:gui0B        = "57ab5a"
+let g:base16_gui0B = "57ab5a"
+let s:gui0C        = "96d0ff"
+let g:base16_gui0C = "96d0ff"
+let s:gui0D        = "539bf5"
+let g:base16_gui0D = "539bf5"
+let s:gui0E        = "e275ad"
+let g:base16_gui0E = "e275ad"
+let s:gui0F        = "ae5622"
+let g:base16_gui0F = "ae5622"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#1c2128"
+  let g:terminal_color_1 =  "#f47067"
+  let g:terminal_color_2 =  "#57ab5a"
+  let g:terminal_color_3 =  "#c69026"
+  let g:terminal_color_4 =  "#539bf5"
+  let g:terminal_color_5 =  "#e275ad"
+  let g:terminal_color_6 =  "#96d0ff"
+  let g:terminal_color_7 =  "#909dab"
+  let g:terminal_color_8 =  "#545d68"
+  let g:terminal_color_9 =  "#f47067"
+  let g:terminal_color_10 = "#57ab5a"
+  let g:terminal_color_11 = "#c69026"
+  let g:terminal_color_12 = "#539bf5"
+  let g:terminal_color_13 = "#e275ad"
+  let g:terminal_color_14 = "#96d0ff"
+  let g:terminal_color_15 = "#cdd9e5"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#1c2128",
+        \ "#f47067",
+        \ "#57ab5a",
+        \ "#c69026",
+        \ "#539bf5",
+        \ "#e275ad",
+        \ "#96d0ff",
+        \ "#909dab",
+        \ "#545d68",
+        \ "#f47067",
+        \ "#57ab5a",
+        \ "#c69026",
+        \ "#539bf5",
+        \ "#e275ad",
+        \ "#96d0ff",
+        \ "#cdd9e5",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-primer-dark-dimmed"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-primer-dark.vim b/colors/base16-primer-dark.vim
new file mode 100644
index 0000000..e3d07fb
--- /dev/null
+++ b/colors/base16-primer-dark.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Primer Dark scheme by Jimmy Lin
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-primer-dark.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "010409"
+let g:base16_gui00 = "010409"
+let s:gui01        = "21262d"
+let g:base16_gui01 = "21262d"
+let s:gui02        = "30363d"
+let g:base16_gui02 = "30363d"
+let s:gui03        = "484f58"
+let g:base16_gui03 = "484f58"
+let s:gui04        = "8b949e"
+let g:base16_gui04 = "8b949e"
+let s:gui05        = "b1bac4"
+let g:base16_gui05 = "b1bac4"
+let s:gui06        = "c9d1d9"
+let g:base16_gui06 = "c9d1d9"
+let s:gui07        = "f0f6fc"
+let g:base16_gui07 = "f0f6fc"
+let s:gui08        = "ff7b72"
+let g:base16_gui08 = "ff7b72"
+let s:gui09        = "f0883e"
+let g:base16_gui09 = "f0883e"
+let s:gui0A        = "d29922"
+let g:base16_gui0A = "d29922"
+let s:gui0B        = "3fb950"
+let g:base16_gui0B = "3fb950"
+let s:gui0C        = "a5d6ff"
+let g:base16_gui0C = "a5d6ff"
+let s:gui0D        = "58a6ff"
+let g:base16_gui0D = "58a6ff"
+let s:gui0E        = "f778ba"
+let g:base16_gui0E = "f778ba"
+let s:gui0F        = "bd561d"
+let g:base16_gui0F = "bd561d"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#010409"
+  let g:terminal_color_1 =  "#ff7b72"
+  let g:terminal_color_2 =  "#3fb950"
+  let g:terminal_color_3 =  "#d29922"
+  let g:terminal_color_4 =  "#58a6ff"
+  let g:terminal_color_5 =  "#f778ba"
+  let g:terminal_color_6 =  "#a5d6ff"
+  let g:terminal_color_7 =  "#b1bac4"
+  let g:terminal_color_8 =  "#484f58"
+  let g:terminal_color_9 =  "#ff7b72"
+  let g:terminal_color_10 = "#3fb950"
+  let g:terminal_color_11 = "#d29922"
+  let g:terminal_color_12 = "#58a6ff"
+  let g:terminal_color_13 = "#f778ba"
+  let g:terminal_color_14 = "#a5d6ff"
+  let g:terminal_color_15 = "#f0f6fc"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#010409",
+        \ "#ff7b72",
+        \ "#3fb950",
+        \ "#d29922",
+        \ "#58a6ff",
+        \ "#f778ba",
+        \ "#a5d6ff",
+        \ "#b1bac4",
+        \ "#484f58",
+        \ "#ff7b72",
+        \ "#3fb950",
+        \ "#d29922",
+        \ "#58a6ff",
+        \ "#f778ba",
+        \ "#a5d6ff",
+        \ "#f0f6fc",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-primer-dark"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-primer-light.vim b/colors/base16-primer-light.vim
new file mode 100644
index 0000000..1123d72
--- /dev/null
+++ b/colors/base16-primer-light.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Primer Light scheme by Jimmy Lin
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-primer-light.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "fafbfc"
+let g:base16_gui00 = "fafbfc"
+let s:gui01        = "e1e4e8"
+let g:base16_gui01 = "e1e4e8"
+let s:gui02        = "d1d5da"
+let g:base16_gui02 = "d1d5da"
+let s:gui03        = "959da5"
+let g:base16_gui03 = "959da5"
+let s:gui04        = "444d56"
+let g:base16_gui04 = "444d56"
+let s:gui05        = "2f363d"
+let g:base16_gui05 = "2f363d"
+let s:gui06        = "24292e"
+let g:base16_gui06 = "24292e"
+let s:gui07        = "1b1f23"
+let g:base16_gui07 = "1b1f23"
+let s:gui08        = "d73a49"
+let g:base16_gui08 = "d73a49"
+let s:gui09        = "f66a0a"
+let g:base16_gui09 = "f66a0a"
+let s:gui0A        = "ffd33d"
+let g:base16_gui0A = "ffd33d"
+let s:gui0B        = "28a745"
+let g:base16_gui0B = "28a745"
+let s:gui0C        = "79b8ff"
+let g:base16_gui0C = "79b8ff"
+let s:gui0D        = "0366d6"
+let g:base16_gui0D = "0366d6"
+let s:gui0E        = "ea4aaa"
+let g:base16_gui0E = "ea4aaa"
+let s:gui0F        = "a04100"
+let g:base16_gui0F = "a04100"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#fafbfc"
+  let g:terminal_color_1 =  "#d73a49"
+  let g:terminal_color_2 =  "#28a745"
+  let g:terminal_color_3 =  "#ffd33d"
+  let g:terminal_color_4 =  "#0366d6"
+  let g:terminal_color_5 =  "#ea4aaa"
+  let g:terminal_color_6 =  "#79b8ff"
+  let g:terminal_color_7 =  "#2f363d"
+  let g:terminal_color_8 =  "#959da5"
+  let g:terminal_color_9 =  "#d73a49"
+  let g:terminal_color_10 = "#28a745"
+  let g:terminal_color_11 = "#ffd33d"
+  let g:terminal_color_12 = "#0366d6"
+  let g:terminal_color_13 = "#ea4aaa"
+  let g:terminal_color_14 = "#79b8ff"
+  let g:terminal_color_15 = "#1b1f23"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#fafbfc",
+        \ "#d73a49",
+        \ "#28a745",
+        \ "#ffd33d",
+        \ "#0366d6",
+        \ "#ea4aaa",
+        \ "#79b8ff",
+        \ "#2f363d",
+        \ "#959da5",
+        \ "#d73a49",
+        \ "#28a745",
+        \ "#ffd33d",
+        \ "#0366d6",
+        \ "#ea4aaa",
+        \ "#79b8ff",
+        \ "#1b1f23",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-primer-light"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-purpledream.vim b/colors/base16-purpledream.vim
new file mode 100644
index 0000000..44dec5f
--- /dev/null
+++ b/colors/base16-purpledream.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Purpledream scheme by malet
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-purpledream.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "100510"
+let g:base16_gui00 = "100510"
+let s:gui01        = "302030"
+let g:base16_gui01 = "302030"
+let s:gui02        = "403040"
+let g:base16_gui02 = "403040"
+let s:gui03        = "605060"
+let g:base16_gui03 = "605060"
+let s:gui04        = "bbb0bb"
+let g:base16_gui04 = "bbb0bb"
+let s:gui05        = "ddd0dd"
+let g:base16_gui05 = "ddd0dd"
+let s:gui06        = "eee0ee"
+let g:base16_gui06 = "eee0ee"
+let s:gui07        = "fff0ff"
+let g:base16_gui07 = "fff0ff"
+let s:gui08        = "ff1d0d"
+let g:base16_gui08 = "ff1d0d"
+let s:gui09        = "ccae14"
+let g:base16_gui09 = "ccae14"
+let s:gui0A        = "f000a0"
+let g:base16_gui0A = "f000a0"
+let s:gui0B        = "14cc64"
+let g:base16_gui0B = "14cc64"
+let s:gui0C        = "0075b0"
+let g:base16_gui0C = "0075b0"
+let s:gui0D        = "00a0f0"
+let g:base16_gui0D = "00a0f0"
+let s:gui0E        = "b000d0"
+let g:base16_gui0E = "b000d0"
+let s:gui0F        = "6a2a3c"
+let g:base16_gui0F = "6a2a3c"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#100510"
+  let g:terminal_color_1 =  "#ff1d0d"
+  let g:terminal_color_2 =  "#14cc64"
+  let g:terminal_color_3 =  "#f000a0"
+  let g:terminal_color_4 =  "#00a0f0"
+  let g:terminal_color_5 =  "#b000d0"
+  let g:terminal_color_6 =  "#0075b0"
+  let g:terminal_color_7 =  "#ddd0dd"
+  let g:terminal_color_8 =  "#605060"
+  let g:terminal_color_9 =  "#ff1d0d"
+  let g:terminal_color_10 = "#14cc64"
+  let g:terminal_color_11 = "#f000a0"
+  let g:terminal_color_12 = "#00a0f0"
+  let g:terminal_color_13 = "#b000d0"
+  let g:terminal_color_14 = "#0075b0"
+  let g:terminal_color_15 = "#fff0ff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#100510",
+        \ "#ff1d0d",
+        \ "#14cc64",
+        \ "#f000a0",
+        \ "#00a0f0",
+        \ "#b000d0",
+        \ "#0075b0",
+        \ "#ddd0dd",
+        \ "#605060",
+        \ "#ff1d0d",
+        \ "#14cc64",
+        \ "#f000a0",
+        \ "#00a0f0",
+        \ "#b000d0",
+        \ "#0075b0",
+        \ "#fff0ff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-purpledream"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-qualia.vim b/colors/base16-qualia.vim
index 487af54..3347b78 100644
--- a/colors/base16-qualia.vim
+++ b/colors/base16-qualia.vim
@@ -25,26 +25,26 @@ let s:gui03        = "454545"
 let g:base16_gui03 = "454545"
 let s:gui04        = "808080"
 let g:base16_gui04 = "808080"
-let s:gui05        = "C0C0C0"
-let g:base16_gui05 = "C0C0C0"
-let s:gui06        = "C0C0C0"
-let g:base16_gui06 = "C0C0C0"
+let s:gui05        = "c0c0c0"
+let g:base16_gui05 = "c0c0c0"
+let s:gui06        = "c0c0c0"
+let g:base16_gui06 = "c0c0c0"
 let s:gui07        = "454545"
 let g:base16_gui07 = "454545"
-let s:gui08        = "EFA6A2"
-let g:base16_gui08 = "EFA6A2"
-let s:gui09        = "A3B8EF"
-let g:base16_gui09 = "A3B8EF"
-let s:gui0A        = "E6A3DC"
-let g:base16_gui0A = "E6A3DC"
-let s:gui0B        = "80C990"
-let g:base16_gui0B = "80C990"
-let s:gui0C        = "C8C874"
-let g:base16_gui0C = "C8C874"
-let s:gui0D        = "50CACD"
-let g:base16_gui0D = "50CACD"
-let s:gui0E        = "E0AF85"
-let g:base16_gui0E = "E0AF85"
+let s:gui08        = "efa6a2"
+let g:base16_gui08 = "efa6a2"
+let s:gui09        = "a3b8ef"
+let g:base16_gui09 = "a3b8ef"
+let s:gui0A        = "e6a3dc"
+let g:base16_gui0A = "e6a3dc"
+let s:gui0B        = "80c990"
+let g:base16_gui0B = "80c990"
+let s:gui0C        = "c8c874"
+let g:base16_gui0C = "c8c874"
+let s:gui0D        = "50cacd"
+let g:base16_gui0D = "50cacd"
+let s:gui0E        = "e0af85"
+let g:base16_gui0E = "e0af85"
 let s:gui0F        = "808080"
 let g:base16_gui0F = "808080"
 
@@ -100,20 +100,20 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#101010"
-  let g:terminal_color_1 =  "#EFA6A2"
-  let g:terminal_color_2 =  "#80C990"
-  let g:terminal_color_3 =  "#E6A3DC"
-  let g:terminal_color_4 =  "#50CACD"
-  let g:terminal_color_5 =  "#E0AF85"
-  let g:terminal_color_6 =  "#C8C874"
-  let g:terminal_color_7 =  "#C0C0C0"
+  let g:terminal_color_1 =  "#efa6a2"
+  let g:terminal_color_2 =  "#80c990"
+  let g:terminal_color_3 =  "#e6a3dc"
+  let g:terminal_color_4 =  "#50cacd"
+  let g:terminal_color_5 =  "#e0af85"
+  let g:terminal_color_6 =  "#c8c874"
+  let g:terminal_color_7 =  "#c0c0c0"
   let g:terminal_color_8 =  "#454545"
-  let g:terminal_color_9 =  "#EFA6A2"
-  let g:terminal_color_10 = "#80C990"
-  let g:terminal_color_11 = "#E6A3DC"
-  let g:terminal_color_12 = "#50CACD"
-  let g:terminal_color_13 = "#E0AF85"
-  let g:terminal_color_14 = "#C8C874"
+  let g:terminal_color_9 =  "#efa6a2"
+  let g:terminal_color_10 = "#80c990"
+  let g:terminal_color_11 = "#e6a3dc"
+  let g:terminal_color_12 = "#50cacd"
+  let g:terminal_color_13 = "#e0af85"
+  let g:terminal_color_14 = "#c8c874"
   let g:terminal_color_15 = "#454545"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -124,20 +124,20 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#101010",
-        \ "#EFA6A2",
-        \ "#80C990",
-        \ "#E6A3DC",
-        \ "#50CACD",
-        \ "#E0AF85",
-        \ "#C8C874",
-        \ "#C0C0C0",
+        \ "#efa6a2",
+        \ "#80c990",
+        \ "#e6a3dc",
+        \ "#50cacd",
+        \ "#e0af85",
+        \ "#c8c874",
+        \ "#c0c0c0",
         \ "#454545",
-        \ "#EFA6A2",
-        \ "#80C990",
-        \ "#E6A3DC",
-        \ "#50CACD",
-        \ "#E0AF85",
-        \ "#C8C874",
+        \ "#efa6a2",
+        \ "#80c990",
+        \ "#e6a3dc",
+        \ "#50cacd",
+        \ "#e0af85",
+        \ "#c8c874",
         \ "#454545",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index bbe9ba6..5c332c8 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim
index e15cc97..e82a67b 100644
--- a/colors/base16-rebecca.vim
+++ b/colors/base16-rebecca.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-rose-pine-dawn.vim b/colors/base16-rose-pine-dawn.vim
index 6a26e8c..69783ee 100644
--- a/colors/base16-rose-pine-dawn.vim
+++ b/colors/base16-rose-pine-dawn.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-rose-pine-moon.vim b/colors/base16-rose-pine-moon.vim
index 98e30ba..6a1890a 100644
--- a/colors/base16-rose-pine-moon.vim
+++ b/colors/base16-rose-pine-moon.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-rose-pine.vim b/colors/base16-rose-pine.vim
index eedb26e..d04b0b0 100644
--- a/colors/base16-rose-pine.vim
+++ b/colors/base16-rose-pine.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-sagelight.vim b/colors/base16-sagelight.vim
index 03a1cf4..a0e75b9 100644
--- a/colors/base16-sagelight.vim
+++ b/colors/base16-sagelight.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-sakura.vim b/colors/base16-sakura.vim
index d825c0f..11520f0 100644
--- a/colors/base16-sakura.vim
+++ b/colors/base16-sakura.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-sandcastle.vim b/colors/base16-sandcastle.vim
index 5a9de2a..4039c20 100644
--- a/colors/base16-sandcastle.vim
+++ b/colors/base16-sandcastle.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim
index 76f38a3..7f175d1 100644
--- a/colors/base16-seti.vim
+++ b/colors/base16-seti.vim
@@ -19,10 +19,10 @@ let s:gui00        = "151718"
 let g:base16_gui00 = "151718"
 let s:gui01        = "282a2b"
 let g:base16_gui01 = "282a2b"
-let s:gui02        = "3B758C"
-let g:base16_gui02 = "3B758C"
-let s:gui03        = "41535B"
-let g:base16_gui03 = "41535B"
+let s:gui02        = "3b758c"
+let g:base16_gui02 = "3b758c"
+let s:gui03        = "41535b"
+let g:base16_gui03 = "41535b"
 let s:gui04        = "43a5d5"
 let g:base16_gui04 = "43a5d5"
 let s:gui05        = "d6d6d6"
@@ -31,8 +31,8 @@ let s:gui06        = "eeeeee"
 let g:base16_gui06 = "eeeeee"
 let s:gui07        = "ffffff"
 let g:base16_gui07 = "ffffff"
-let s:gui08        = "Cd3f45"
-let g:base16_gui08 = "Cd3f45"
+let s:gui08        = "cd3f45"
+let g:base16_gui08 = "cd3f45"
 let s:gui09        = "db7b55"
 let g:base16_gui09 = "db7b55"
 let s:gui0A        = "e6cd69"
@@ -100,15 +100,15 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#151718"
-  let g:terminal_color_1 =  "#Cd3f45"
+  let g:terminal_color_1 =  "#cd3f45"
   let g:terminal_color_2 =  "#9fca56"
   let g:terminal_color_3 =  "#e6cd69"
   let g:terminal_color_4 =  "#55b5db"
   let g:terminal_color_5 =  "#a074c4"
   let g:terminal_color_6 =  "#55dbbe"
   let g:terminal_color_7 =  "#d6d6d6"
-  let g:terminal_color_8 =  "#41535B"
-  let g:terminal_color_9 =  "#Cd3f45"
+  let g:terminal_color_8 =  "#41535b"
+  let g:terminal_color_9 =  "#cd3f45"
   let g:terminal_color_10 = "#9fca56"
   let g:terminal_color_11 = "#e6cd69"
   let g:terminal_color_12 = "#55b5db"
@@ -124,15 +124,15 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#151718",
-        \ "#Cd3f45",
+        \ "#cd3f45",
         \ "#9fca56",
         \ "#e6cd69",
         \ "#55b5db",
         \ "#a074c4",
         \ "#55dbbe",
         \ "#d6d6d6",
-        \ "#41535B",
-        \ "#Cd3f45",
+        \ "#41535b",
+        \ "#cd3f45",
         \ "#9fca56",
         \ "#e6cd69",
         \ "#55b5db",
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-shades-of-purple.vim b/colors/base16-shades-of-purple.vim
index cd02b22..56f784e 100644
--- a/colors/base16-shades-of-purple.vim
+++ b/colors/base16-shades-of-purple.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-shadesmear-dark.vim b/colors/base16-shadesmear-dark.vim
new file mode 100644
index 0000000..e508ca6
--- /dev/null
+++ b/colors/base16-shadesmear-dark.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" ShadeSmear Dark scheme by Kyle Giammarco (http://kyle.giammar.co)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-shadesmear-dark.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "232323"
+let g:base16_gui00 = "232323"
+let s:gui01        = "1c1c1c"
+let g:base16_gui01 = "1c1c1c"
+let s:gui02        = "4e4e4e"
+let g:base16_gui02 = "4e4e4e"
+let s:gui03        = "c0c0c0"
+let g:base16_gui03 = "c0c0c0"
+let s:gui04        = "e4e4e4"
+let g:base16_gui04 = "e4e4e4"
+let s:gui05        = "dbdbdb"
+let g:base16_gui05 = "dbdbdb"
+let s:gui06        = "e4e4e4"
+let g:base16_gui06 = "e4e4e4"
+let s:gui07        = "1c1c1c"
+let g:base16_gui07 = "1c1c1c"
+let s:gui08        = "cc5450"
+let g:base16_gui08 = "cc5450"
+let s:gui09        = "a64270"
+let g:base16_gui09 = "a64270"
+let s:gui0A        = "307878"
+let g:base16_gui0A = "307878"
+let s:gui0B        = "71983b"
+let g:base16_gui0B = "71983b"
+let s:gui0C        = "c57d42"
+let g:base16_gui0C = "c57d42"
+let s:gui0D        = "376388"
+let g:base16_gui0D = "376388"
+let s:gui0E        = "d7ab54"
+let g:base16_gui0E = "d7ab54"
+let s:gui0F        = "6d6d6d"
+let g:base16_gui0F = "6d6d6d"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#232323"
+  let g:terminal_color_1 =  "#cc5450"
+  let g:terminal_color_2 =  "#71983b"
+  let g:terminal_color_3 =  "#307878"
+  let g:terminal_color_4 =  "#376388"
+  let g:terminal_color_5 =  "#d7ab54"
+  let g:terminal_color_6 =  "#c57d42"
+  let g:terminal_color_7 =  "#dbdbdb"
+  let g:terminal_color_8 =  "#c0c0c0"
+  let g:terminal_color_9 =  "#cc5450"
+  let g:terminal_color_10 = "#71983b"
+  let g:terminal_color_11 = "#307878"
+  let g:terminal_color_12 = "#376388"
+  let g:terminal_color_13 = "#d7ab54"
+  let g:terminal_color_14 = "#c57d42"
+  let g:terminal_color_15 = "#1c1c1c"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#232323",
+        \ "#cc5450",
+        \ "#71983b",
+        \ "#307878",
+        \ "#376388",
+        \ "#d7ab54",
+        \ "#c57d42",
+        \ "#dbdbdb",
+        \ "#c0c0c0",
+        \ "#cc5450",
+        \ "#71983b",
+        \ "#307878",
+        \ "#376388",
+        \ "#d7ab54",
+        \ "#c57d42",
+        \ "#1c1c1c",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-shadesmear-dark"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-shadesmear-light.vim b/colors/base16-shadesmear-light.vim
new file mode 100644
index 0000000..c81c84d
--- /dev/null
+++ b/colors/base16-shadesmear-light.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" ShadeSmear Light scheme by Kyle Giammarco (http://kyle.giammar.co)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-shadesmear-light.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "dbdbdb"
+let g:base16_gui00 = "dbdbdb"
+let s:gui01        = "e4e4e4"
+let g:base16_gui01 = "e4e4e4"
+let s:gui02        = "c0c0c0"
+let g:base16_gui02 = "c0c0c0"
+let s:gui03        = "4e4e4e"
+let g:base16_gui03 = "4e4e4e"
+let s:gui04        = "1c1c1c"
+let g:base16_gui04 = "1c1c1c"
+let s:gui05        = "232323"
+let g:base16_gui05 = "232323"
+let s:gui06        = "1c1c1c"
+let g:base16_gui06 = "1c1c1c"
+let s:gui07        = "e4e4e4"
+let g:base16_gui07 = "e4e4e4"
+let s:gui08        = "cc5450"
+let g:base16_gui08 = "cc5450"
+let s:gui09        = "a64270"
+let g:base16_gui09 = "a64270"
+let s:gui0A        = "307878"
+let g:base16_gui0A = "307878"
+let s:gui0B        = "71983b"
+let g:base16_gui0B = "71983b"
+let s:gui0C        = "c57d42"
+let g:base16_gui0C = "c57d42"
+let s:gui0D        = "376388"
+let g:base16_gui0D = "376388"
+let s:gui0E        = "d7ab54"
+let g:base16_gui0E = "d7ab54"
+let s:gui0F        = "6d6d6d"
+let g:base16_gui0F = "6d6d6d"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#dbdbdb"
+  let g:terminal_color_1 =  "#cc5450"
+  let g:terminal_color_2 =  "#71983b"
+  let g:terminal_color_3 =  "#307878"
+  let g:terminal_color_4 =  "#376388"
+  let g:terminal_color_5 =  "#d7ab54"
+  let g:terminal_color_6 =  "#c57d42"
+  let g:terminal_color_7 =  "#232323"
+  let g:terminal_color_8 =  "#4e4e4e"
+  let g:terminal_color_9 =  "#cc5450"
+  let g:terminal_color_10 = "#71983b"
+  let g:terminal_color_11 = "#307878"
+  let g:terminal_color_12 = "#376388"
+  let g:terminal_color_13 = "#d7ab54"
+  let g:terminal_color_14 = "#c57d42"
+  let g:terminal_color_15 = "#e4e4e4"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#dbdbdb",
+        \ "#cc5450",
+        \ "#71983b",
+        \ "#307878",
+        \ "#376388",
+        \ "#d7ab54",
+        \ "#c57d42",
+        \ "#232323",
+        \ "#4e4e4e",
+        \ "#cc5450",
+        \ "#71983b",
+        \ "#307878",
+        \ "#376388",
+        \ "#d7ab54",
+        \ "#c57d42",
+        \ "#e4e4e4",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-shadesmear-light"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index c0dd189..159be42 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-silk-dark.vim b/colors/base16-silk-dark.vim
index 08eb8c6..9ba068a 100644
--- a/colors/base16-silk-dark.vim
+++ b/colors/base16-silk-dark.vim
@@ -17,20 +17,20 @@ endif
 " GUI color definitions
 let s:gui00        = "0e3c46"
 let g:base16_gui00 = "0e3c46"
-let s:gui01        = "1D494E"
-let g:base16_gui01 = "1D494E"
-let s:gui02        = "2A5054"
-let g:base16_gui02 = "2A5054"
+let s:gui01        = "1d494e"
+let g:base16_gui01 = "1d494e"
+let s:gui02        = "2a5054"
+let g:base16_gui02 = "2a5054"
 let s:gui03        = "587073"
 let g:base16_gui03 = "587073"
-let s:gui04        = "9DC8CD"
-let g:base16_gui04 = "9DC8CD"
-let s:gui05        = "C7DBDD"
-let g:base16_gui05 = "C7DBDD"
-let s:gui06        = "CBF2F7"
-let g:base16_gui06 = "CBF2F7"
-let s:gui07        = "D2FAFF"
-let g:base16_gui07 = "D2FAFF"
+let s:gui04        = "9dc8cd"
+let g:base16_gui04 = "9dc8cd"
+let s:gui05        = "c7dbdd"
+let g:base16_gui05 = "c7dbdd"
+let s:gui06        = "cbf2f7"
+let g:base16_gui06 = "cbf2f7"
+let s:gui07        = "d2faff"
+let g:base16_gui07 = "d2faff"
 let s:gui08        = "fb6953"
 let g:base16_gui08 = "fb6953"
 let s:gui09        = "fcab74"
@@ -106,7 +106,7 @@ if has("nvim")
   let g:terminal_color_4 =  "#46bddd"
   let g:terminal_color_5 =  "#756b8a"
   let g:terminal_color_6 =  "#3fb2b9"
-  let g:terminal_color_7 =  "#C7DBDD"
+  let g:terminal_color_7 =  "#c7dbdd"
   let g:terminal_color_8 =  "#587073"
   let g:terminal_color_9 =  "#fb6953"
   let g:terminal_color_10 = "#73d8ad"
@@ -114,7 +114,7 @@ if has("nvim")
   let g:terminal_color_12 = "#46bddd"
   let g:terminal_color_13 = "#756b8a"
   let g:terminal_color_14 = "#3fb2b9"
-  let g:terminal_color_15 = "#D2FAFF"
+  let g:terminal_color_15 = "#d2faff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -130,7 +130,7 @@ elseif has("terminal")
         \ "#46bddd",
         \ "#756b8a",
         \ "#3fb2b9",
-        \ "#C7DBDD",
+        \ "#c7dbdd",
         \ "#587073",
         \ "#fb6953",
         \ "#73d8ad",
@@ -138,7 +138,7 @@ elseif has("terminal")
         \ "#46bddd",
         \ "#756b8a",
         \ "#3fb2b9",
-        \ "#D2FAFF",
+        \ "#d2faff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-silk-light.vim b/colors/base16-silk-light.vim
index 0b20d0e..d740575 100644
--- a/colors/base16-silk-light.vim
+++ b/colors/base16-silk-light.vim
@@ -15,36 +15,36 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "E9F1EF"
-let g:base16_gui00 = "E9F1EF"
-let s:gui01        = "CCD4D3"
-let g:base16_gui01 = "CCD4D3"
-let s:gui02        = "90B7B6"
-let g:base16_gui02 = "90B7B6"
-let s:gui03        = "5C787B"
-let g:base16_gui03 = "5C787B"
-let s:gui04        = "4B5B5F"
-let g:base16_gui04 = "4B5B5F"
+let s:gui00        = "e9f1ef"
+let g:base16_gui00 = "e9f1ef"
+let s:gui01        = "ccd4d3"
+let g:base16_gui01 = "ccd4d3"
+let s:gui02        = "90b7b6"
+let g:base16_gui02 = "90b7b6"
+let s:gui03        = "5c787b"
+let g:base16_gui03 = "5c787b"
+let s:gui04        = "4b5b5f"
+let g:base16_gui04 = "4b5b5f"
 let s:gui05        = "385156"
 let g:base16_gui05 = "385156"
 let s:gui06        = "0e3c46"
 let g:base16_gui06 = "0e3c46"
-let s:gui07        = "D2FAFF"
-let g:base16_gui07 = "D2FAFF"
-let s:gui08        = "CF432E"
-let g:base16_gui08 = "CF432E"
-let s:gui09        = "D27F46"
-let g:base16_gui09 = "D27F46"
-let s:gui0A        = "CFAD25"
-let g:base16_gui0A = "CFAD25"
-let s:gui0B        = "6CA38C"
-let g:base16_gui0B = "6CA38C"
-let s:gui0C        = "329CA2"
-let g:base16_gui0C = "329CA2"
-let s:gui0D        = "39AAC9"
-let g:base16_gui0D = "39AAC9"
-let s:gui0E        = "6E6582"
-let g:base16_gui0E = "6E6582"
+let s:gui07        = "d2faff"
+let g:base16_gui07 = "d2faff"
+let s:gui08        = "cf432e"
+let g:base16_gui08 = "cf432e"
+let s:gui09        = "d27f46"
+let g:base16_gui09 = "d27f46"
+let s:gui0A        = "cfad25"
+let g:base16_gui0A = "cfad25"
+let s:gui0B        = "6ca38c"
+let g:base16_gui0B = "6ca38c"
+let s:gui0C        = "329ca2"
+let g:base16_gui0C = "329ca2"
+let s:gui0D        = "39aac9"
+let g:base16_gui0D = "39aac9"
+let s:gui0E        = "6e6582"
+let g:base16_gui0E = "6e6582"
 let s:gui0F        = "865369"
 let g:base16_gui0F = "865369"
 
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#E9F1EF"
-  let g:terminal_color_1 =  "#CF432E"
-  let g:terminal_color_2 =  "#6CA38C"
-  let g:terminal_color_3 =  "#CFAD25"
-  let g:terminal_color_4 =  "#39AAC9"
-  let g:terminal_color_5 =  "#6E6582"
-  let g:terminal_color_6 =  "#329CA2"
+  let g:terminal_color_0 =  "#e9f1ef"
+  let g:terminal_color_1 =  "#cf432e"
+  let g:terminal_color_2 =  "#6ca38c"
+  let g:terminal_color_3 =  "#cfad25"
+  let g:terminal_color_4 =  "#39aac9"
+  let g:terminal_color_5 =  "#6e6582"
+  let g:terminal_color_6 =  "#329ca2"
   let g:terminal_color_7 =  "#385156"
-  let g:terminal_color_8 =  "#5C787B"
-  let g:terminal_color_9 =  "#CF432E"
-  let g:terminal_color_10 = "#6CA38C"
-  let g:terminal_color_11 = "#CFAD25"
-  let g:terminal_color_12 = "#39AAC9"
-  let g:terminal_color_13 = "#6E6582"
-  let g:terminal_color_14 = "#329CA2"
-  let g:terminal_color_15 = "#D2FAFF"
+  let g:terminal_color_8 =  "#5c787b"
+  let g:terminal_color_9 =  "#cf432e"
+  let g:terminal_color_10 = "#6ca38c"
+  let g:terminal_color_11 = "#cfad25"
+  let g:terminal_color_12 = "#39aac9"
+  let g:terminal_color_13 = "#6e6582"
+  let g:terminal_color_14 = "#329ca2"
+  let g:terminal_color_15 = "#d2faff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#E9F1EF",
-        \ "#CF432E",
-        \ "#6CA38C",
-        \ "#CFAD25",
-        \ "#39AAC9",
-        \ "#6E6582",
-        \ "#329CA2",
+        \ "#e9f1ef",
+        \ "#cf432e",
+        \ "#6ca38c",
+        \ "#cfad25",
+        \ "#39aac9",
+        \ "#6e6582",
+        \ "#329ca2",
         \ "#385156",
-        \ "#5C787B",
-        \ "#CF432E",
-        \ "#6CA38C",
-        \ "#CFAD25",
-        \ "#39AAC9",
-        \ "#6E6582",
-        \ "#329CA2",
-        \ "#D2FAFF",
+        \ "#5c787b",
+        \ "#cf432e",
+        \ "#6ca38c",
+        \ "#cfad25",
+        \ "#39aac9",
+        \ "#6e6582",
+        \ "#329ca2",
+        \ "#d2faff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-snazzy.vim b/colors/base16-snazzy.vim
index 71b570a..7a44b56 100644
--- a/colors/base16-snazzy.vim
+++ b/colors/base16-snazzy.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-solarflare-light.vim b/colors/base16-solarflare-light.vim
index eee32e3..7982ac8 100644
--- a/colors/base16-solarflare-light.vim
+++ b/colors/base16-solarflare-light.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "F5F7FA"
-let g:base16_gui00 = "F5F7FA"
-let s:gui01        = "E8E9ED"
-let g:base16_gui01 = "E8E9ED"
-let s:gui02        = "A6AFB8"
-let g:base16_gui02 = "A6AFB8"
-let s:gui03        = "85939E"
-let g:base16_gui03 = "85939E"
+let s:gui00        = "f5f7fa"
+let g:base16_gui00 = "f5f7fa"
+let s:gui01        = "e8e9ed"
+let g:base16_gui01 = "e8e9ed"
+let s:gui02        = "a6afb8"
+let g:base16_gui02 = "a6afb8"
+let s:gui03        = "85939e"
+let g:base16_gui03 = "85939e"
 let s:gui04        = "667581"
 let g:base16_gui04 = "667581"
 let s:gui05        = "586875"
 let g:base16_gui05 = "586875"
-let s:gui06        = "222E38"
-let g:base16_gui06 = "222E38"
-let s:gui07        = "18262F"
-let g:base16_gui07 = "18262F"
-let s:gui08        = "EF5253"
-let g:base16_gui08 = "EF5253"
-let s:gui09        = "E66B2B"
-let g:base16_gui09 = "E66B2B"
-let s:gui0A        = "E4B51C"
-let g:base16_gui0A = "E4B51C"
-let s:gui0B        = "7CC844"
-let g:base16_gui0B = "7CC844"
-let s:gui0C        = "52CBB0"
-let g:base16_gui0C = "52CBB0"
-let s:gui0D        = "33B5E1"
-let g:base16_gui0D = "33B5E1"
-let s:gui0E        = "A363D5"
-let g:base16_gui0E = "A363D5"
-let s:gui0F        = "D73C9A"
-let g:base16_gui0F = "D73C9A"
+let s:gui06        = "222e38"
+let g:base16_gui06 = "222e38"
+let s:gui07        = "18262f"
+let g:base16_gui07 = "18262f"
+let s:gui08        = "ef5253"
+let g:base16_gui08 = "ef5253"
+let s:gui09        = "e66b2b"
+let g:base16_gui09 = "e66b2b"
+let s:gui0A        = "e4b51c"
+let g:base16_gui0A = "e4b51c"
+let s:gui0B        = "7cc844"
+let g:base16_gui0B = "7cc844"
+let s:gui0C        = "52cbb0"
+let g:base16_gui0C = "52cbb0"
+let s:gui0D        = "33b5e1"
+let g:base16_gui0D = "33b5e1"
+let s:gui0E        = "a363d5"
+let g:base16_gui0E = "a363d5"
+let s:gui0F        = "d73c9a"
+let g:base16_gui0F = "d73c9a"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#F5F7FA"
-  let g:terminal_color_1 =  "#EF5253"
-  let g:terminal_color_2 =  "#7CC844"
-  let g:terminal_color_3 =  "#E4B51C"
-  let g:terminal_color_4 =  "#33B5E1"
-  let g:terminal_color_5 =  "#A363D5"
-  let g:terminal_color_6 =  "#52CBB0"
+  let g:terminal_color_0 =  "#f5f7fa"
+  let g:terminal_color_1 =  "#ef5253"
+  let g:terminal_color_2 =  "#7cc844"
+  let g:terminal_color_3 =  "#e4b51c"
+  let g:terminal_color_4 =  "#33b5e1"
+  let g:terminal_color_5 =  "#a363d5"
+  let g:terminal_color_6 =  "#52cbb0"
   let g:terminal_color_7 =  "#586875"
-  let g:terminal_color_8 =  "#85939E"
-  let g:terminal_color_9 =  "#EF5253"
-  let g:terminal_color_10 = "#7CC844"
-  let g:terminal_color_11 = "#E4B51C"
-  let g:terminal_color_12 = "#33B5E1"
-  let g:terminal_color_13 = "#A363D5"
-  let g:terminal_color_14 = "#52CBB0"
-  let g:terminal_color_15 = "#18262F"
+  let g:terminal_color_8 =  "#85939e"
+  let g:terminal_color_9 =  "#ef5253"
+  let g:terminal_color_10 = "#7cc844"
+  let g:terminal_color_11 = "#e4b51c"
+  let g:terminal_color_12 = "#33b5e1"
+  let g:terminal_color_13 = "#a363d5"
+  let g:terminal_color_14 = "#52cbb0"
+  let g:terminal_color_15 = "#18262f"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#F5F7FA",
-        \ "#EF5253",
-        \ "#7CC844",
-        \ "#E4B51C",
-        \ "#33B5E1",
-        \ "#A363D5",
-        \ "#52CBB0",
+        \ "#f5f7fa",
+        \ "#ef5253",
+        \ "#7cc844",
+        \ "#e4b51c",
+        \ "#33b5e1",
+        \ "#a363d5",
+        \ "#52cbb0",
         \ "#586875",
-        \ "#85939E",
-        \ "#EF5253",
-        \ "#7CC844",
-        \ "#E4B51C",
-        \ "#33B5E1",
-        \ "#A363D5",
-        \ "#52CBB0",
-        \ "#18262F",
+        \ "#85939e",
+        \ "#ef5253",
+        \ "#7cc844",
+        \ "#e4b51c",
+        \ "#33b5e1",
+        \ "#a363d5",
+        \ "#52cbb0",
+        \ "#18262f",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim
index 4ff5cce..54ba0b7 100644
--- a/colors/base16-solarflare.vim
+++ b/colors/base16-solarflare.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "18262F"
-let g:base16_gui00 = "18262F"
-let s:gui01        = "222E38"
-let g:base16_gui01 = "222E38"
+let s:gui00        = "18262f"
+let g:base16_gui00 = "18262f"
+let s:gui01        = "222e38"
+let g:base16_gui01 = "222e38"
 let s:gui02        = "586875"
 let g:base16_gui02 = "586875"
 let s:gui03        = "667581"
 let g:base16_gui03 = "667581"
-let s:gui04        = "85939E"
-let g:base16_gui04 = "85939E"
-let s:gui05        = "A6AFB8"
-let g:base16_gui05 = "A6AFB8"
-let s:gui06        = "E8E9ED"
-let g:base16_gui06 = "E8E9ED"
-let s:gui07        = "F5F7FA"
-let g:base16_gui07 = "F5F7FA"
-let s:gui08        = "EF5253"
-let g:base16_gui08 = "EF5253"
-let s:gui09        = "E66B2B"
-let g:base16_gui09 = "E66B2B"
-let s:gui0A        = "E4B51C"
-let g:base16_gui0A = "E4B51C"
-let s:gui0B        = "7CC844"
-let g:base16_gui0B = "7CC844"
-let s:gui0C        = "52CBB0"
-let g:base16_gui0C = "52CBB0"
-let s:gui0D        = "33B5E1"
-let g:base16_gui0D = "33B5E1"
-let s:gui0E        = "A363D5"
-let g:base16_gui0E = "A363D5"
-let s:gui0F        = "D73C9A"
-let g:base16_gui0F = "D73C9A"
+let s:gui04        = "85939e"
+let g:base16_gui04 = "85939e"
+let s:gui05        = "a6afb8"
+let g:base16_gui05 = "a6afb8"
+let s:gui06        = "e8e9ed"
+let g:base16_gui06 = "e8e9ed"
+let s:gui07        = "f5f7fa"
+let g:base16_gui07 = "f5f7fa"
+let s:gui08        = "ef5253"
+let g:base16_gui08 = "ef5253"
+let s:gui09        = "e66b2b"
+let g:base16_gui09 = "e66b2b"
+let s:gui0A        = "e4b51c"
+let g:base16_gui0A = "e4b51c"
+let s:gui0B        = "7cc844"
+let g:base16_gui0B = "7cc844"
+let s:gui0C        = "52cbb0"
+let g:base16_gui0C = "52cbb0"
+let s:gui0D        = "33b5e1"
+let g:base16_gui0D = "33b5e1"
+let s:gui0E        = "a363d5"
+let g:base16_gui0E = "a363d5"
+let s:gui0F        = "d73c9a"
+let g:base16_gui0F = "d73c9a"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#18262F"
-  let g:terminal_color_1 =  "#EF5253"
-  let g:terminal_color_2 =  "#7CC844"
-  let g:terminal_color_3 =  "#E4B51C"
-  let g:terminal_color_4 =  "#33B5E1"
-  let g:terminal_color_5 =  "#A363D5"
-  let g:terminal_color_6 =  "#52CBB0"
-  let g:terminal_color_7 =  "#A6AFB8"
+  let g:terminal_color_0 =  "#18262f"
+  let g:terminal_color_1 =  "#ef5253"
+  let g:terminal_color_2 =  "#7cc844"
+  let g:terminal_color_3 =  "#e4b51c"
+  let g:terminal_color_4 =  "#33b5e1"
+  let g:terminal_color_5 =  "#a363d5"
+  let g:terminal_color_6 =  "#52cbb0"
+  let g:terminal_color_7 =  "#a6afb8"
   let g:terminal_color_8 =  "#667581"
-  let g:terminal_color_9 =  "#EF5253"
-  let g:terminal_color_10 = "#7CC844"
-  let g:terminal_color_11 = "#E4B51C"
-  let g:terminal_color_12 = "#33B5E1"
-  let g:terminal_color_13 = "#A363D5"
-  let g:terminal_color_14 = "#52CBB0"
-  let g:terminal_color_15 = "#F5F7FA"
+  let g:terminal_color_9 =  "#ef5253"
+  let g:terminal_color_10 = "#7cc844"
+  let g:terminal_color_11 = "#e4b51c"
+  let g:terminal_color_12 = "#33b5e1"
+  let g:terminal_color_13 = "#a363d5"
+  let g:terminal_color_14 = "#52cbb0"
+  let g:terminal_color_15 = "#f5f7fa"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#18262F",
-        \ "#EF5253",
-        \ "#7CC844",
-        \ "#E4B51C",
-        \ "#33B5E1",
-        \ "#A363D5",
-        \ "#52CBB0",
-        \ "#A6AFB8",
+        \ "#18262f",
+        \ "#ef5253",
+        \ "#7cc844",
+        \ "#e4b51c",
+        \ "#33b5e1",
+        \ "#a363d5",
+        \ "#52cbb0",
+        \ "#a6afb8",
         \ "#667581",
-        \ "#EF5253",
-        \ "#7CC844",
-        \ "#E4B51C",
-        \ "#33B5E1",
-        \ "#A363D5",
-        \ "#52CBB0",
-        \ "#F5F7FA",
+        \ "#ef5253",
+        \ "#7cc844",
+        \ "#e4b51c",
+        \ "#33b5e1",
+        \ "#a363d5",
+        \ "#52cbb0",
+        \ "#f5f7fa",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim
index 6a70cee..6358d16 100644
--- a/colors/base16-solarized-dark.vim
+++ b/colors/base16-solarized-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim
index 28338a3..c9f747d 100644
--- a/colors/base16-solarized-light.vim
+++ b/colors/base16-solarized-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-spaceduck.vim b/colors/base16-spaceduck.vim
new file mode 100644
index 0000000..5e223ac
--- /dev/null
+++ b/colors/base16-spaceduck.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Spaceduck scheme by Guillermo Rodriguez (https://github.com/pineapplegiant), packaged by Gabriel Fontes (https://github.com/Misterio77)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-spaceduck.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "16172d"
+let g:base16_gui00 = "16172d"
+let s:gui01        = "1b1c36"
+let g:base16_gui01 = "1b1c36"
+let s:gui02        = "30365f"
+let g:base16_gui02 = "30365f"
+let s:gui03        = "686f9a"
+let g:base16_gui03 = "686f9a"
+let s:gui04        = "818596"
+let g:base16_gui04 = "818596"
+let s:gui05        = "ecf0c1"
+let g:base16_gui05 = "ecf0c1"
+let s:gui06        = "c1c3cc"
+let g:base16_gui06 = "c1c3cc"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "e33400"
+let g:base16_gui08 = "e33400"
+let s:gui09        = "e39400"
+let g:base16_gui09 = "e39400"
+let s:gui0A        = "f2ce00"
+let g:base16_gui0A = "f2ce00"
+let s:gui0B        = "5ccc96"
+let g:base16_gui0B = "5ccc96"
+let s:gui0C        = "00a3cc"
+let g:base16_gui0C = "00a3cc"
+let s:gui0D        = "7a5ccc"
+let g:base16_gui0D = "7a5ccc"
+let s:gui0E        = "b3a1e6"
+let g:base16_gui0E = "b3a1e6"
+let s:gui0F        = "ce6f8f"
+let g:base16_gui0F = "ce6f8f"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#16172d"
+  let g:terminal_color_1 =  "#e33400"
+  let g:terminal_color_2 =  "#5ccc96"
+  let g:terminal_color_3 =  "#f2ce00"
+  let g:terminal_color_4 =  "#7a5ccc"
+  let g:terminal_color_5 =  "#b3a1e6"
+  let g:terminal_color_6 =  "#00a3cc"
+  let g:terminal_color_7 =  "#ecf0c1"
+  let g:terminal_color_8 =  "#686f9a"
+  let g:terminal_color_9 =  "#e33400"
+  let g:terminal_color_10 = "#5ccc96"
+  let g:terminal_color_11 = "#f2ce00"
+  let g:terminal_color_12 = "#7a5ccc"
+  let g:terminal_color_13 = "#b3a1e6"
+  let g:terminal_color_14 = "#00a3cc"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#16172d",
+        \ "#e33400",
+        \ "#5ccc96",
+        \ "#f2ce00",
+        \ "#7a5ccc",
+        \ "#b3a1e6",
+        \ "#00a3cc",
+        \ "#ecf0c1",
+        \ "#686f9a",
+        \ "#e33400",
+        \ "#5ccc96",
+        \ "#f2ce00",
+        \ "#7a5ccc",
+        \ "#b3a1e6",
+        \ "#00a3cc",
+        \ "#ffffff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-spaceduck"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim
index 5b3961f..eca75b5 100644
--- a/colors/base16-spacemacs.vim
+++ b/colors/base16-spacemacs.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-stella.vim b/colors/base16-stella.vim
new file mode 100644
index 0000000..e751192
--- /dev/null
+++ b/colors/base16-stella.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Stella scheme by Shrimpram
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-stella.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "2b213c"
+let g:base16_gui00 = "2b213c"
+let s:gui01        = "362b48"
+let g:base16_gui01 = "362b48"
+let s:gui02        = "4d4160"
+let g:base16_gui02 = "4d4160"
+let s:gui03        = "655978"
+let g:base16_gui03 = "655978"
+let s:gui04        = "7f7192"
+let g:base16_gui04 = "7f7192"
+let s:gui05        = "998bad"
+let g:base16_gui05 = "998bad"
+let s:gui06        = "b4a5c8"
+let g:base16_gui06 = "b4a5c8"
+let s:gui07        = "ebdcff"
+let g:base16_gui07 = "ebdcff"
+let s:gui08        = "c79987"
+let g:base16_gui08 = "c79987"
+let s:gui09        = "8865c6"
+let g:base16_gui09 = "8865c6"
+let s:gui0A        = "c7c691"
+let g:base16_gui0A = "c7c691"
+let s:gui0B        = "acc79b"
+let g:base16_gui0B = "acc79b"
+let s:gui0C        = "9bc7bf"
+let g:base16_gui0C = "9bc7bf"
+let s:gui0D        = "a5aad4"
+let g:base16_gui0D = "a5aad4"
+let s:gui0E        = "c594ff"
+let g:base16_gui0E = "c594ff"
+let s:gui0F        = "c7ab87"
+let g:base16_gui0F = "c7ab87"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2b213c"
+  let g:terminal_color_1 =  "#c79987"
+  let g:terminal_color_2 =  "#acc79b"
+  let g:terminal_color_3 =  "#c7c691"
+  let g:terminal_color_4 =  "#a5aad4"
+  let g:terminal_color_5 =  "#c594ff"
+  let g:terminal_color_6 =  "#9bc7bf"
+  let g:terminal_color_7 =  "#998bad"
+  let g:terminal_color_8 =  "#655978"
+  let g:terminal_color_9 =  "#c79987"
+  let g:terminal_color_10 = "#acc79b"
+  let g:terminal_color_11 = "#c7c691"
+  let g:terminal_color_12 = "#a5aad4"
+  let g:terminal_color_13 = "#c594ff"
+  let g:terminal_color_14 = "#9bc7bf"
+  let g:terminal_color_15 = "#ebdcff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#2b213c",
+        \ "#c79987",
+        \ "#acc79b",
+        \ "#c7c691",
+        \ "#a5aad4",
+        \ "#c594ff",
+        \ "#9bc7bf",
+        \ "#998bad",
+        \ "#655978",
+        \ "#c79987",
+        \ "#acc79b",
+        \ "#c7c691",
+        \ "#a5aad4",
+        \ "#c594ff",
+        \ "#9bc7bf",
+        \ "#ebdcff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-stella"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-still-alive.vim b/colors/base16-still-alive.vim
new file mode 100644
index 0000000..8d3cab1
--- /dev/null
+++ b/colors/base16-still-alive.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Still Alive scheme by Derrick McKee (derrick.mckee@gmail.com)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-still-alive.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "f0f0f0"
+let g:base16_gui00 = "f0f0f0"
+let s:gui01        = "f0d848"
+let g:base16_gui01 = "f0d848"
+let s:gui02        = "fff018"
+let g:base16_gui02 = "fff018"
+let s:gui03        = "f01818"
+let g:base16_gui03 = "f01818"
+let s:gui04        = "f00000"
+let g:base16_gui04 = "f00000"
+let s:gui05        = "d80000"
+let g:base16_gui05 = "d80000"
+let s:gui06        = "489000"
+let g:base16_gui06 = "489000"
+let s:gui07        = "30a860"
+let g:base16_gui07 = "30a860"
+let s:gui08        = "487830"
+let g:base16_gui08 = "487830"
+let s:gui09        = "183048"
+let g:base16_gui09 = "183048"
+let s:gui0A        = "426395"
+let g:base16_gui0A = "426395"
+let s:gui0B        = "5c5c6a"
+let g:base16_gui0B = "5c5c6a"
+let s:gui0C        = "2c3c57"
+let g:base16_gui0C = "2c3c57"
+let s:gui0D        = "001878"
+let g:base16_gui0D = "001878"
+let s:gui0E        = "900000"
+let g:base16_gui0E = "900000"
+let s:gui0F        = "140c0d"
+let g:base16_gui0F = "140c0d"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#f0f0f0"
+  let g:terminal_color_1 =  "#487830"
+  let g:terminal_color_2 =  "#5c5c6a"
+  let g:terminal_color_3 =  "#426395"
+  let g:terminal_color_4 =  "#001878"
+  let g:terminal_color_5 =  "#900000"
+  let g:terminal_color_6 =  "#2c3c57"
+  let g:terminal_color_7 =  "#d80000"
+  let g:terminal_color_8 =  "#f01818"
+  let g:terminal_color_9 =  "#487830"
+  let g:terminal_color_10 = "#5c5c6a"
+  let g:terminal_color_11 = "#426395"
+  let g:terminal_color_12 = "#001878"
+  let g:terminal_color_13 = "#900000"
+  let g:terminal_color_14 = "#2c3c57"
+  let g:terminal_color_15 = "#30a860"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#f0f0f0",
+        \ "#487830",
+        \ "#5c5c6a",
+        \ "#426395",
+        \ "#001878",
+        \ "#900000",
+        \ "#2c3c57",
+        \ "#d80000",
+        \ "#f01818",
+        \ "#487830",
+        \ "#5c5c6a",
+        \ "#426395",
+        \ "#001878",
+        \ "#900000",
+        \ "#2c3c57",
+        \ "#30a860",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-still-alive"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-summercamp.vim b/colors/base16-summercamp.vim
index d15ddd6..217397c 100644
--- a/colors/base16-summercamp.vim
+++ b/colors/base16-summercamp.vim
@@ -43,10 +43,10 @@ let s:gui0C        = "5aebbc"
 let g:base16_gui0C = "5aebbc"
 let s:gui0D        = "489bf0"
 let g:base16_gui0D = "489bf0"
-let s:gui0E        = "FF8080"
-let g:base16_gui0E = "FF8080"
-let s:gui0F        = "F69BE7"
-let g:base16_gui0F = "F69BE7"
+let s:gui0E        = "ff8080"
+let g:base16_gui0E = "ff8080"
+let s:gui0F        = "f69be7"
+let g:base16_gui0F = "f69be7"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -104,7 +104,7 @@ if has("nvim")
   let g:terminal_color_2 =  "#5ceb5a"
   let g:terminal_color_3 =  "#f2ff27"
   let g:terminal_color_4 =  "#489bf0"
-  let g:terminal_color_5 =  "#FF8080"
+  let g:terminal_color_5 =  "#ff8080"
   let g:terminal_color_6 =  "#5aebbc"
   let g:terminal_color_7 =  "#736e55"
   let g:terminal_color_8 =  "#504b38"
@@ -112,7 +112,7 @@ if has("nvim")
   let g:terminal_color_10 = "#5ceb5a"
   let g:terminal_color_11 = "#f2ff27"
   let g:terminal_color_12 = "#489bf0"
-  let g:terminal_color_13 = "#FF8080"
+  let g:terminal_color_13 = "#ff8080"
   let g:terminal_color_14 = "#5aebbc"
   let g:terminal_color_15 = "#f8f5de"
   let g:terminal_color_background = g:terminal_color_0
@@ -128,7 +128,7 @@ elseif has("terminal")
         \ "#5ceb5a",
         \ "#f2ff27",
         \ "#489bf0",
-        \ "#FF8080",
+        \ "#ff8080",
         \ "#5aebbc",
         \ "#736e55",
         \ "#504b38",
@@ -136,7 +136,7 @@ elseif has("terminal")
         \ "#5ceb5a",
         \ "#f2ff27",
         \ "#489bf0",
-        \ "#FF8080",
+        \ "#ff8080",
         \ "#5aebbc",
         \ "#f8f5de",
         \ ]
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim
index 779ec99..ea2641e 100644
--- a/colors/base16-summerfruit-dark.vim
+++ b/colors/base16-summerfruit-dark.vim
@@ -23,30 +23,30 @@ let s:gui02        = "303030"
 let g:base16_gui02 = "303030"
 let s:gui03        = "505050"
 let g:base16_gui03 = "505050"
-let s:gui04        = "B0B0B0"
-let g:base16_gui04 = "B0B0B0"
-let s:gui05        = "D0D0D0"
-let g:base16_gui05 = "D0D0D0"
-let s:gui06        = "E0E0E0"
-let g:base16_gui06 = "E0E0E0"
-let s:gui07        = "FFFFFF"
-let g:base16_gui07 = "FFFFFF"
-let s:gui08        = "FF0086"
-let g:base16_gui08 = "FF0086"
-let s:gui09        = "FD8900"
-let g:base16_gui09 = "FD8900"
-let s:gui0A        = "ABA800"
-let g:base16_gui0A = "ABA800"
-let s:gui0B        = "00C918"
-let g:base16_gui0B = "00C918"
-let s:gui0C        = "1FAAAA"
-let g:base16_gui0C = "1FAAAA"
-let s:gui0D        = "3777E6"
-let g:base16_gui0D = "3777E6"
-let s:gui0E        = "AD00A1"
-let g:base16_gui0E = "AD00A1"
-let s:gui0F        = "CC6633"
-let g:base16_gui0F = "CC6633"
+let s:gui04        = "b0b0b0"
+let g:base16_gui04 = "b0b0b0"
+let s:gui05        = "d0d0d0"
+let g:base16_gui05 = "d0d0d0"
+let s:gui06        = "e0e0e0"
+let g:base16_gui06 = "e0e0e0"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "ff0086"
+let g:base16_gui08 = "ff0086"
+let s:gui09        = "fd8900"
+let g:base16_gui09 = "fd8900"
+let s:gui0A        = "aba800"
+let g:base16_gui0A = "aba800"
+let s:gui0B        = "00c918"
+let g:base16_gui0B = "00c918"
+let s:gui0C        = "1faaaa"
+let g:base16_gui0C = "1faaaa"
+let s:gui0D        = "3777e6"
+let g:base16_gui0D = "3777e6"
+let s:gui0E        = "ad00a1"
+let g:base16_gui0E = "ad00a1"
+let s:gui0F        = "cc6633"
+let g:base16_gui0F = "cc6633"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -100,21 +100,21 @@ endif
 " Neovim terminal colours
 if has("nvim")
   let g:terminal_color_0 =  "#151515"
-  let g:terminal_color_1 =  "#FF0086"
-  let g:terminal_color_2 =  "#00C918"
-  let g:terminal_color_3 =  "#ABA800"
-  let g:terminal_color_4 =  "#3777E6"
-  let g:terminal_color_5 =  "#AD00A1"
-  let g:terminal_color_6 =  "#1FAAAA"
-  let g:terminal_color_7 =  "#D0D0D0"
+  let g:terminal_color_1 =  "#ff0086"
+  let g:terminal_color_2 =  "#00c918"
+  let g:terminal_color_3 =  "#aba800"
+  let g:terminal_color_4 =  "#3777e6"
+  let g:terminal_color_5 =  "#ad00a1"
+  let g:terminal_color_6 =  "#1faaaa"
+  let g:terminal_color_7 =  "#d0d0d0"
   let g:terminal_color_8 =  "#505050"
-  let g:terminal_color_9 =  "#FF0086"
-  let g:terminal_color_10 = "#00C918"
-  let g:terminal_color_11 = "#ABA800"
-  let g:terminal_color_12 = "#3777E6"
-  let g:terminal_color_13 = "#AD00A1"
-  let g:terminal_color_14 = "#1FAAAA"
-  let g:terminal_color_15 = "#FFFFFF"
+  let g:terminal_color_9 =  "#ff0086"
+  let g:terminal_color_10 = "#00c918"
+  let g:terminal_color_11 = "#aba800"
+  let g:terminal_color_12 = "#3777e6"
+  let g:terminal_color_13 = "#ad00a1"
+  let g:terminal_color_14 = "#1faaaa"
+  let g:terminal_color_15 = "#ffffff"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -124,21 +124,21 @@ if has("nvim")
 elseif has("terminal")
   let g:terminal_ansi_colors = [
         \ "#151515",
-        \ "#FF0086",
-        \ "#00C918",
-        \ "#ABA800",
-        \ "#3777E6",
-        \ "#AD00A1",
-        \ "#1FAAAA",
-        \ "#D0D0D0",
+        \ "#ff0086",
+        \ "#00c918",
+        \ "#aba800",
+        \ "#3777e6",
+        \ "#ad00a1",
+        \ "#1faaaa",
+        \ "#d0d0d0",
         \ "#505050",
-        \ "#FF0086",
-        \ "#00C918",
-        \ "#ABA800",
-        \ "#3777E6",
-        \ "#AD00A1",
-        \ "#1FAAAA",
-        \ "#FFFFFF",
+        \ "#ff0086",
+        \ "#00c918",
+        \ "#aba800",
+        \ "#3777e6",
+        \ "#ad00a1",
+        \ "#1faaaa",
+        \ "#ffffff",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim
index 6d451e8..cedd717 100644
--- a/colors/base16-summerfruit-light.vim
+++ b/colors/base16-summerfruit-light.vim
@@ -15,14 +15,14 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "FFFFFF"
-let g:base16_gui00 = "FFFFFF"
-let s:gui01        = "E0E0E0"
-let g:base16_gui01 = "E0E0E0"
-let s:gui02        = "D0D0D0"
-let g:base16_gui02 = "D0D0D0"
-let s:gui03        = "B0B0B0"
-let g:base16_gui03 = "B0B0B0"
+let s:gui00        = "ffffff"
+let g:base16_gui00 = "ffffff"
+let s:gui01        = "e0e0e0"
+let g:base16_gui01 = "e0e0e0"
+let s:gui02        = "d0d0d0"
+let g:base16_gui02 = "d0d0d0"
+let s:gui03        = "b0b0b0"
+let g:base16_gui03 = "b0b0b0"
 let s:gui04        = "000000"
 let g:base16_gui04 = "000000"
 let s:gui05        = "101010"
@@ -31,22 +31,22 @@ let s:gui06        = "151515"
 let g:base16_gui06 = "151515"
 let s:gui07        = "202020"
 let g:base16_gui07 = "202020"
-let s:gui08        = "FF0086"
-let g:base16_gui08 = "FF0086"
-let s:gui09        = "FD8900"
-let g:base16_gui09 = "FD8900"
-let s:gui0A        = "ABA800"
-let g:base16_gui0A = "ABA800"
-let s:gui0B        = "00C918"
-let g:base16_gui0B = "00C918"
-let s:gui0C        = "1FAAAA"
-let g:base16_gui0C = "1FAAAA"
-let s:gui0D        = "3777E6"
-let g:base16_gui0D = "3777E6"
-let s:gui0E        = "AD00A1"
-let g:base16_gui0E = "AD00A1"
-let s:gui0F        = "CC6633"
-let g:base16_gui0F = "CC6633"
+let s:gui08        = "ff0086"
+let g:base16_gui08 = "ff0086"
+let s:gui09        = "fd8900"
+let g:base16_gui09 = "fd8900"
+let s:gui0A        = "aba800"
+let g:base16_gui0A = "aba800"
+let s:gui0B        = "00c918"
+let g:base16_gui0B = "00c918"
+let s:gui0C        = "1faaaa"
+let g:base16_gui0C = "1faaaa"
+let s:gui0D        = "3777e6"
+let g:base16_gui0D = "3777e6"
+let s:gui0E        = "ad00a1"
+let g:base16_gui0E = "ad00a1"
+let s:gui0F        = "cc6633"
+let g:base16_gui0F = "cc6633"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,21 +99,21 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#FFFFFF"
-  let g:terminal_color_1 =  "#FF0086"
-  let g:terminal_color_2 =  "#00C918"
-  let g:terminal_color_3 =  "#ABA800"
-  let g:terminal_color_4 =  "#3777E6"
-  let g:terminal_color_5 =  "#AD00A1"
-  let g:terminal_color_6 =  "#1FAAAA"
+  let g:terminal_color_0 =  "#ffffff"
+  let g:terminal_color_1 =  "#ff0086"
+  let g:terminal_color_2 =  "#00c918"
+  let g:terminal_color_3 =  "#aba800"
+  let g:terminal_color_4 =  "#3777e6"
+  let g:terminal_color_5 =  "#ad00a1"
+  let g:terminal_color_6 =  "#1faaaa"
   let g:terminal_color_7 =  "#101010"
-  let g:terminal_color_8 =  "#B0B0B0"
-  let g:terminal_color_9 =  "#FF0086"
-  let g:terminal_color_10 = "#00C918"
-  let g:terminal_color_11 = "#ABA800"
-  let g:terminal_color_12 = "#3777E6"
-  let g:terminal_color_13 = "#AD00A1"
-  let g:terminal_color_14 = "#1FAAAA"
+  let g:terminal_color_8 =  "#b0b0b0"
+  let g:terminal_color_9 =  "#ff0086"
+  let g:terminal_color_10 = "#00c918"
+  let g:terminal_color_11 = "#aba800"
+  let g:terminal_color_12 = "#3777e6"
+  let g:terminal_color_13 = "#ad00a1"
+  let g:terminal_color_14 = "#1faaaa"
   let g:terminal_color_15 = "#202020"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
@@ -123,21 +123,21 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#FFFFFF",
-        \ "#FF0086",
-        \ "#00C918",
-        \ "#ABA800",
-        \ "#3777E6",
-        \ "#AD00A1",
-        \ "#1FAAAA",
+        \ "#ffffff",
+        \ "#ff0086",
+        \ "#00c918",
+        \ "#aba800",
+        \ "#3777e6",
+        \ "#ad00a1",
+        \ "#1faaaa",
         \ "#101010",
-        \ "#B0B0B0",
-        \ "#FF0086",
-        \ "#00C918",
-        \ "#ABA800",
-        \ "#3777E6",
-        \ "#AD00A1",
-        \ "#1FAAAA",
+        \ "#b0b0b0",
+        \ "#ff0086",
+        \ "#00c918",
+        \ "#aba800",
+        \ "#3777e6",
+        \ "#ad00a1",
+        \ "#1faaaa",
         \ "#202020",
         \ ]
 endif
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-synth-midnight-dark.vim b/colors/base16-synth-midnight-dark.vim
index 2495339..aa5073d 100644
--- a/colors/base16-synth-midnight-dark.vim
+++ b/colors/base16-synth-midnight-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-synth-midnight-light.vim b/colors/base16-synth-midnight-light.vim
index 9e8f9b5..ce90e82 100644
--- a/colors/base16-synth-midnight-light.vim
+++ b/colors/base16-synth-midnight-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tango.vim b/colors/base16-tango.vim
index 19d770e..9894f94 100644
--- a/colors/base16-tango.vim
+++ b/colors/base16-tango.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tender.vim b/colors/base16-tender.vim
index 21358db..330e4f3 100644
--- a/colors/base16-tender.vim
+++ b/colors/base16-tender.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-city-dark.vim b/colors/base16-tokyo-city-dark.vim
index 07fb729..75d75e1 100644
--- a/colors/base16-tokyo-city-dark.vim
+++ b/colors/base16-tokyo-city-dark.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "171D23"
-let g:base16_gui00 = "171D23"
-let s:gui01        = "1D252C"
-let g:base16_gui01 = "1D252C"
-let s:gui02        = "28323A"
-let g:base16_gui02 = "28323A"
+let s:gui00        = "171d23"
+let g:base16_gui00 = "171d23"
+let s:gui01        = "1d252c"
+let g:base16_gui01 = "1d252c"
+let s:gui02        = "28323a"
+let g:base16_gui02 = "28323a"
 let s:gui03        = "526270"
 let g:base16_gui03 = "526270"
-let s:gui04        = "B7C5D3"
-let g:base16_gui04 = "B7C5D3"
-let s:gui05        = "D8E2EC"
-let g:base16_gui05 = "D8E2EC"
-let s:gui06        = "F6F6F8"
-let g:base16_gui06 = "F6F6F8"
-let s:gui07        = "FBFBFD"
-let g:base16_gui07 = "FBFBFD"
-let s:gui08        = "F7768E"
-let g:base16_gui08 = "F7768E"
-let s:gui09        = "FF9E64"
-let g:base16_gui09 = "FF9E64"
-let s:gui0A        = "B7C5D3"
-let g:base16_gui0A = "B7C5D3"
-let s:gui0B        = "9ECE6A"
-let g:base16_gui0B = "9ECE6A"
-let s:gui0C        = "89DDFF"
-let g:base16_gui0C = "89DDFF"
-let s:gui0D        = "7AA2F7"
-let g:base16_gui0D = "7AA2F7"
-let s:gui0E        = "BB9AF7"
-let g:base16_gui0E = "BB9AF7"
-let s:gui0F        = "BB9AF7"
-let g:base16_gui0F = "BB9AF7"
+let s:gui04        = "b7c5d3"
+let g:base16_gui04 = "b7c5d3"
+let s:gui05        = "d8e2ec"
+let g:base16_gui05 = "d8e2ec"
+let s:gui06        = "f6f6f8"
+let g:base16_gui06 = "f6f6f8"
+let s:gui07        = "fbfbfd"
+let g:base16_gui07 = "fbfbfd"
+let s:gui08        = "f7768e"
+let g:base16_gui08 = "f7768e"
+let s:gui09        = "ff9e64"
+let g:base16_gui09 = "ff9e64"
+let s:gui0A        = "b7c5d3"
+let g:base16_gui0A = "b7c5d3"
+let s:gui0B        = "9ece6a"
+let g:base16_gui0B = "9ece6a"
+let s:gui0C        = "89ddff"
+let g:base16_gui0C = "89ddff"
+let s:gui0D        = "7aa2f7"
+let g:base16_gui0D = "7aa2f7"
+let s:gui0E        = "bb9af7"
+let g:base16_gui0E = "bb9af7"
+let s:gui0F        = "bb9af7"
+let g:base16_gui0F = "bb9af7"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#171D23"
-  let g:terminal_color_1 =  "#F7768E"
-  let g:terminal_color_2 =  "#9ECE6A"
-  let g:terminal_color_3 =  "#B7C5D3"
-  let g:terminal_color_4 =  "#7AA2F7"
-  let g:terminal_color_5 =  "#BB9AF7"
-  let g:terminal_color_6 =  "#89DDFF"
-  let g:terminal_color_7 =  "#D8E2EC"
+  let g:terminal_color_0 =  "#171d23"
+  let g:terminal_color_1 =  "#f7768e"
+  let g:terminal_color_2 =  "#9ece6a"
+  let g:terminal_color_3 =  "#b7c5d3"
+  let g:terminal_color_4 =  "#7aa2f7"
+  let g:terminal_color_5 =  "#bb9af7"
+  let g:terminal_color_6 =  "#89ddff"
+  let g:terminal_color_7 =  "#d8e2ec"
   let g:terminal_color_8 =  "#526270"
-  let g:terminal_color_9 =  "#F7768E"
-  let g:terminal_color_10 = "#9ECE6A"
-  let g:terminal_color_11 = "#B7C5D3"
-  let g:terminal_color_12 = "#7AA2F7"
-  let g:terminal_color_13 = "#BB9AF7"
-  let g:terminal_color_14 = "#89DDFF"
-  let g:terminal_color_15 = "#FBFBFD"
+  let g:terminal_color_9 =  "#f7768e"
+  let g:terminal_color_10 = "#9ece6a"
+  let g:terminal_color_11 = "#b7c5d3"
+  let g:terminal_color_12 = "#7aa2f7"
+  let g:terminal_color_13 = "#bb9af7"
+  let g:terminal_color_14 = "#89ddff"
+  let g:terminal_color_15 = "#fbfbfd"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#171D23",
-        \ "#F7768E",
-        \ "#9ECE6A",
-        \ "#B7C5D3",
-        \ "#7AA2F7",
-        \ "#BB9AF7",
-        \ "#89DDFF",
-        \ "#D8E2EC",
+        \ "#171d23",
+        \ "#f7768e",
+        \ "#9ece6a",
+        \ "#b7c5d3",
+        \ "#7aa2f7",
+        \ "#bb9af7",
+        \ "#89ddff",
+        \ "#d8e2ec",
         \ "#526270",
-        \ "#F7768E",
-        \ "#9ECE6A",
-        \ "#B7C5D3",
-        \ "#7AA2F7",
-        \ "#BB9AF7",
-        \ "#89DDFF",
-        \ "#FBFBFD",
+        \ "#f7768e",
+        \ "#9ece6a",
+        \ "#b7c5d3",
+        \ "#7aa2f7",
+        \ "#bb9af7",
+        \ "#89ddff",
+        \ "#fbfbfd",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-city-light.vim b/colors/base16-tokyo-city-light.vim
index 7a2acd9..0b66b3b 100644
--- a/colors/base16-tokyo-city-light.vim
+++ b/colors/base16-tokyo-city-light.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "FBFBFD"
-let g:base16_gui00 = "FBFBFD"
-let s:gui01        = "F6F6F8"
-let g:base16_gui01 = "F6F6F8"
-let s:gui02        = "EDEFF6"
-let g:base16_gui02 = "EDEFF6"
-let s:gui03        = "9699A3"
-let g:base16_gui03 = "9699A3"
+let s:gui00        = "fbfbfd"
+let g:base16_gui00 = "fbfbfd"
+let s:gui01        = "f6f6f8"
+let g:base16_gui01 = "f6f6f8"
+let s:gui02        = "edeff6"
+let g:base16_gui02 = "edeff6"
+let s:gui03        = "9699a3"
+let g:base16_gui03 = "9699a3"
 let s:gui04        = "4c505e"
 let g:base16_gui04 = "4c505e"
-let s:gui05        = "343B59"
-let g:base16_gui05 = "343B59"
-let s:gui06        = "1D252C"
-let g:base16_gui06 = "1D252C"
-let s:gui07        = "171D23"
-let g:base16_gui07 = "171D23"
-let s:gui08        = "8C4351"
-let g:base16_gui08 = "8C4351"
+let s:gui05        = "343b59"
+let g:base16_gui05 = "343b59"
+let s:gui06        = "1d252c"
+let g:base16_gui06 = "1d252c"
+let s:gui07        = "171d23"
+let g:base16_gui07 = "171d23"
+let s:gui08        = "8c4351"
+let g:base16_gui08 = "8c4351"
 let s:gui09        = "965027"
 let g:base16_gui09 = "965027"
-let s:gui0A        = "4C505E"
-let g:base16_gui0A = "4C505E"
-let s:gui0B        = "485E30"
-let g:base16_gui0B = "485E30"
-let s:gui0C        = "4C505E"
-let g:base16_gui0C = "4C505E"
+let s:gui0A        = "4c505e"
+let g:base16_gui0A = "4c505e"
+let s:gui0B        = "485e30"
+let g:base16_gui0B = "485e30"
+let s:gui0C        = "4c505e"
+let g:base16_gui0C = "4c505e"
 let s:gui0D        = "34548a"
 let g:base16_gui0D = "34548a"
-let s:gui0E        = "5A4A78"
-let g:base16_gui0E = "5A4A78"
-let s:gui0F        = "5A4A78"
-let g:base16_gui0F = "5A4A78"
+let s:gui0E        = "5a4a78"
+let g:base16_gui0E = "5a4a78"
+let s:gui0F        = "5a4a78"
+let g:base16_gui0F = "5a4a78"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#FBFBFD"
-  let g:terminal_color_1 =  "#8C4351"
-  let g:terminal_color_2 =  "#485E30"
-  let g:terminal_color_3 =  "#4C505E"
+  let g:terminal_color_0 =  "#fbfbfd"
+  let g:terminal_color_1 =  "#8c4351"
+  let g:terminal_color_2 =  "#485e30"
+  let g:terminal_color_3 =  "#4c505e"
   let g:terminal_color_4 =  "#34548a"
-  let g:terminal_color_5 =  "#5A4A78"
-  let g:terminal_color_6 =  "#4C505E"
-  let g:terminal_color_7 =  "#343B59"
-  let g:terminal_color_8 =  "#9699A3"
-  let g:terminal_color_9 =  "#8C4351"
-  let g:terminal_color_10 = "#485E30"
-  let g:terminal_color_11 = "#4C505E"
+  let g:terminal_color_5 =  "#5a4a78"
+  let g:terminal_color_6 =  "#4c505e"
+  let g:terminal_color_7 =  "#343b59"
+  let g:terminal_color_8 =  "#9699a3"
+  let g:terminal_color_9 =  "#8c4351"
+  let g:terminal_color_10 = "#485e30"
+  let g:terminal_color_11 = "#4c505e"
   let g:terminal_color_12 = "#34548a"
-  let g:terminal_color_13 = "#5A4A78"
-  let g:terminal_color_14 = "#4C505E"
-  let g:terminal_color_15 = "#171D23"
+  let g:terminal_color_13 = "#5a4a78"
+  let g:terminal_color_14 = "#4c505e"
+  let g:terminal_color_15 = "#171d23"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#FBFBFD",
-        \ "#8C4351",
-        \ "#485E30",
-        \ "#4C505E",
+        \ "#fbfbfd",
+        \ "#8c4351",
+        \ "#485e30",
+        \ "#4c505e",
         \ "#34548a",
-        \ "#5A4A78",
-        \ "#4C505E",
-        \ "#343B59",
-        \ "#9699A3",
-        \ "#8C4351",
-        \ "#485E30",
-        \ "#4C505E",
+        \ "#5a4a78",
+        \ "#4c505e",
+        \ "#343b59",
+        \ "#9699a3",
+        \ "#8c4351",
+        \ "#485e30",
+        \ "#4c505e",
         \ "#34548a",
-        \ "#5A4A78",
-        \ "#4C505E",
-        \ "#171D23",
+        \ "#5a4a78",
+        \ "#4c505e",
+        \ "#171d23",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-city-terminal-dark.vim b/colors/base16-tokyo-city-terminal-dark.vim
index a5dde91..8280dc7 100644
--- a/colors/base16-tokyo-city-terminal-dark.vim
+++ b/colors/base16-tokyo-city-terminal-dark.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "171D23"
-let g:base16_gui00 = "171D23"
-let s:gui01        = "1D252C"
-let g:base16_gui01 = "1D252C"
-let s:gui02        = "28323A"
-let g:base16_gui02 = "28323A"
+let s:gui00        = "171d23"
+let g:base16_gui00 = "171d23"
+let s:gui01        = "1d252c"
+let g:base16_gui01 = "1d252c"
+let s:gui02        = "28323a"
+let g:base16_gui02 = "28323a"
 let s:gui03        = "526270"
 let g:base16_gui03 = "526270"
-let s:gui04        = "B7C5D3"
-let g:base16_gui04 = "B7C5D3"
-let s:gui05        = "D8E2EC"
-let g:base16_gui05 = "D8E2EC"
-let s:gui06        = "F6F6F8"
-let g:base16_gui06 = "F6F6F8"
-let s:gui07        = "FBFBFD"
-let g:base16_gui07 = "FBFBFD"
-let s:gui08        = "D95468"
-let g:base16_gui08 = "D95468"
-let s:gui09        = "FF9E64"
-let g:base16_gui09 = "FF9E64"
-let s:gui0A        = "EBBF83"
-let g:base16_gui0A = "EBBF83"
-let s:gui0B        = "8BD49C"
-let g:base16_gui0B = "8BD49C"
-let s:gui0C        = "70E1E8"
-let g:base16_gui0C = "70E1E8"
-let s:gui0D        = "539AFC"
-let g:base16_gui0D = "539AFC"
-let s:gui0E        = "B62D65"
-let g:base16_gui0E = "B62D65"
-let s:gui0F        = "DD9D82"
-let g:base16_gui0F = "DD9D82"
+let s:gui04        = "b7c5d3"
+let g:base16_gui04 = "b7c5d3"
+let s:gui05        = "d8e2ec"
+let g:base16_gui05 = "d8e2ec"
+let s:gui06        = "f6f6f8"
+let g:base16_gui06 = "f6f6f8"
+let s:gui07        = "fbfbfd"
+let g:base16_gui07 = "fbfbfd"
+let s:gui08        = "d95468"
+let g:base16_gui08 = "d95468"
+let s:gui09        = "ff9e64"
+let g:base16_gui09 = "ff9e64"
+let s:gui0A        = "ebbf83"
+let g:base16_gui0A = "ebbf83"
+let s:gui0B        = "8bd49c"
+let g:base16_gui0B = "8bd49c"
+let s:gui0C        = "70e1e8"
+let g:base16_gui0C = "70e1e8"
+let s:gui0D        = "539afc"
+let g:base16_gui0D = "539afc"
+let s:gui0E        = "b62d65"
+let g:base16_gui0E = "b62d65"
+let s:gui0F        = "dd9d82"
+let g:base16_gui0F = "dd9d82"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#171D23"
-  let g:terminal_color_1 =  "#D95468"
-  let g:terminal_color_2 =  "#8BD49C"
-  let g:terminal_color_3 =  "#EBBF83"
-  let g:terminal_color_4 =  "#539AFC"
-  let g:terminal_color_5 =  "#B62D65"
-  let g:terminal_color_6 =  "#70E1E8"
-  let g:terminal_color_7 =  "#D8E2EC"
+  let g:terminal_color_0 =  "#171d23"
+  let g:terminal_color_1 =  "#d95468"
+  let g:terminal_color_2 =  "#8bd49c"
+  let g:terminal_color_3 =  "#ebbf83"
+  let g:terminal_color_4 =  "#539afc"
+  let g:terminal_color_5 =  "#b62d65"
+  let g:terminal_color_6 =  "#70e1e8"
+  let g:terminal_color_7 =  "#d8e2ec"
   let g:terminal_color_8 =  "#526270"
-  let g:terminal_color_9 =  "#D95468"
-  let g:terminal_color_10 = "#8BD49C"
-  let g:terminal_color_11 = "#EBBF83"
-  let g:terminal_color_12 = "#539AFC"
-  let g:terminal_color_13 = "#B62D65"
-  let g:terminal_color_14 = "#70E1E8"
-  let g:terminal_color_15 = "#FBFBFD"
+  let g:terminal_color_9 =  "#d95468"
+  let g:terminal_color_10 = "#8bd49c"
+  let g:terminal_color_11 = "#ebbf83"
+  let g:terminal_color_12 = "#539afc"
+  let g:terminal_color_13 = "#b62d65"
+  let g:terminal_color_14 = "#70e1e8"
+  let g:terminal_color_15 = "#fbfbfd"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#171D23",
-        \ "#D95468",
-        \ "#8BD49C",
-        \ "#EBBF83",
-        \ "#539AFC",
-        \ "#B62D65",
-        \ "#70E1E8",
-        \ "#D8E2EC",
+        \ "#171d23",
+        \ "#d95468",
+        \ "#8bd49c",
+        \ "#ebbf83",
+        \ "#539afc",
+        \ "#b62d65",
+        \ "#70e1e8",
+        \ "#d8e2ec",
         \ "#526270",
-        \ "#D95468",
-        \ "#8BD49C",
-        \ "#EBBF83",
-        \ "#539AFC",
-        \ "#B62D65",
-        \ "#70E1E8",
-        \ "#FBFBFD",
+        \ "#d95468",
+        \ "#8bd49c",
+        \ "#ebbf83",
+        \ "#539afc",
+        \ "#b62d65",
+        \ "#70e1e8",
+        \ "#fbfbfd",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-city-terminal-light.vim b/colors/base16-tokyo-city-terminal-light.vim
index aa3f6f9..2d81acc 100644
--- a/colors/base16-tokyo-city-terminal-light.vim
+++ b/colors/base16-tokyo-city-terminal-light.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "FBFBFD"
-let g:base16_gui00 = "FBFBFD"
-let s:gui01        = "F6F6F8"
-let g:base16_gui01 = "F6F6F8"
-let s:gui02        = "D8E2EC"
-let g:base16_gui02 = "D8E2EC"
-let s:gui03        = "B7C5D3"
-let g:base16_gui03 = "B7C5D3"
+let s:gui00        = "fbfbfd"
+let g:base16_gui00 = "fbfbfd"
+let s:gui01        = "f6f6f8"
+let g:base16_gui01 = "f6f6f8"
+let s:gui02        = "d8e2ec"
+let g:base16_gui02 = "d8e2ec"
+let s:gui03        = "b7c5d3"
+let g:base16_gui03 = "b7c5d3"
 let s:gui04        = "526270"
 let g:base16_gui04 = "526270"
-let s:gui05        = "28323A"
-let g:base16_gui05 = "28323A"
-let s:gui06        = "1D252C"
-let g:base16_gui06 = "1D252C"
-let s:gui07        = "171D23"
-let g:base16_gui07 = "171D23"
-let s:gui08        = "8C4351"
-let g:base16_gui08 = "8C4351"
+let s:gui05        = "28323a"
+let g:base16_gui05 = "28323a"
+let s:gui06        = "1d252c"
+let g:base16_gui06 = "1d252c"
+let s:gui07        = "171d23"
+let g:base16_gui07 = "171d23"
+let s:gui08        = "8c4351"
+let g:base16_gui08 = "8c4351"
 let s:gui09        = "965027"
 let g:base16_gui09 = "965027"
-let s:gui0A        = "8f5E15"
-let g:base16_gui0A = "8f5E15"
-let s:gui0B        = "33635C"
-let g:base16_gui0B = "33635C"
-let s:gui0C        = "0F4B6E"
-let g:base16_gui0C = "0F4B6E"
-let s:gui0D        = "34548A"
-let g:base16_gui0D = "34548A"
-let s:gui0E        = "5A4A78"
-let g:base16_gui0E = "5A4A78"
-let s:gui0F        = "7E5140"
-let g:base16_gui0F = "7E5140"
+let s:gui0A        = "8f5e15"
+let g:base16_gui0A = "8f5e15"
+let s:gui0B        = "33635c"
+let g:base16_gui0B = "33635c"
+let s:gui0C        = "0f4b6e"
+let g:base16_gui0C = "0f4b6e"
+let s:gui0D        = "34548a"
+let g:base16_gui0D = "34548a"
+let s:gui0E        = "5a4a78"
+let g:base16_gui0E = "5a4a78"
+let s:gui0F        = "7e5140"
+let g:base16_gui0F = "7e5140"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#FBFBFD"
-  let g:terminal_color_1 =  "#8C4351"
-  let g:terminal_color_2 =  "#33635C"
-  let g:terminal_color_3 =  "#8f5E15"
-  let g:terminal_color_4 =  "#34548A"
-  let g:terminal_color_5 =  "#5A4A78"
-  let g:terminal_color_6 =  "#0F4B6E"
-  let g:terminal_color_7 =  "#28323A"
-  let g:terminal_color_8 =  "#B7C5D3"
-  let g:terminal_color_9 =  "#8C4351"
-  let g:terminal_color_10 = "#33635C"
-  let g:terminal_color_11 = "#8f5E15"
-  let g:terminal_color_12 = "#34548A"
-  let g:terminal_color_13 = "#5A4A78"
-  let g:terminal_color_14 = "#0F4B6E"
-  let g:terminal_color_15 = "#171D23"
+  let g:terminal_color_0 =  "#fbfbfd"
+  let g:terminal_color_1 =  "#8c4351"
+  let g:terminal_color_2 =  "#33635c"
+  let g:terminal_color_3 =  "#8f5e15"
+  let g:terminal_color_4 =  "#34548a"
+  let g:terminal_color_5 =  "#5a4a78"
+  let g:terminal_color_6 =  "#0f4b6e"
+  let g:terminal_color_7 =  "#28323a"
+  let g:terminal_color_8 =  "#b7c5d3"
+  let g:terminal_color_9 =  "#8c4351"
+  let g:terminal_color_10 = "#33635c"
+  let g:terminal_color_11 = "#8f5e15"
+  let g:terminal_color_12 = "#34548a"
+  let g:terminal_color_13 = "#5a4a78"
+  let g:terminal_color_14 = "#0f4b6e"
+  let g:terminal_color_15 = "#171d23"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#FBFBFD",
-        \ "#8C4351",
-        \ "#33635C",
-        \ "#8f5E15",
-        \ "#34548A",
-        \ "#5A4A78",
-        \ "#0F4B6E",
-        \ "#28323A",
-        \ "#B7C5D3",
-        \ "#8C4351",
-        \ "#33635C",
-        \ "#8f5E15",
-        \ "#34548A",
-        \ "#5A4A78",
-        \ "#0F4B6E",
-        \ "#171D23",
+        \ "#fbfbfd",
+        \ "#8c4351",
+        \ "#33635c",
+        \ "#8f5e15",
+        \ "#34548a",
+        \ "#5a4a78",
+        \ "#0f4b6e",
+        \ "#28323a",
+        \ "#b7c5d3",
+        \ "#8c4351",
+        \ "#33635c",
+        \ "#8f5e15",
+        \ "#34548a",
+        \ "#5a4a78",
+        \ "#0f4b6e",
+        \ "#171d23",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-night-dark.vim b/colors/base16-tokyo-night-dark.vim
index 3c951ec..2acfcfc 100644
--- a/colors/base16-tokyo-night-dark.vim
+++ b/colors/base16-tokyo-night-dark.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "1A1B26"
-let g:base16_gui00 = "1A1B26"
-let s:gui01        = "16161E"
-let g:base16_gui01 = "16161E"
-let s:gui02        = "2F3549"
-let g:base16_gui02 = "2F3549"
-let s:gui03        = "444B6A"
-let g:base16_gui03 = "444B6A"
-let s:gui04        = "787C99"
-let g:base16_gui04 = "787C99"
-let s:gui05        = "A9B1D6"
-let g:base16_gui05 = "A9B1D6"
-let s:gui06        = "CBCCD1"
-let g:base16_gui06 = "CBCCD1"
-let s:gui07        = "D5D6DB"
-let g:base16_gui07 = "D5D6DB"
-let s:gui08        = "C0CAF5"
-let g:base16_gui08 = "C0CAF5"
-let s:gui09        = "A9B1D6"
-let g:base16_gui09 = "A9B1D6"
-let s:gui0A        = "0DB9D7"
-let g:base16_gui0A = "0DB9D7"
-let s:gui0B        = "9ECE6A"
-let g:base16_gui0B = "9ECE6A"
-let s:gui0C        = "B4F9F8"
-let g:base16_gui0C = "B4F9F8"
-let s:gui0D        = "2AC3DE"
-let g:base16_gui0D = "2AC3DE"
-let s:gui0E        = "BB9AF7"
-let g:base16_gui0E = "BB9AF7"
-let s:gui0F        = "F7768E"
-let g:base16_gui0F = "F7768E"
+let s:gui00        = "1a1b26"
+let g:base16_gui00 = "1a1b26"
+let s:gui01        = "16161e"
+let g:base16_gui01 = "16161e"
+let s:gui02        = "2f3549"
+let g:base16_gui02 = "2f3549"
+let s:gui03        = "444b6a"
+let g:base16_gui03 = "444b6a"
+let s:gui04        = "787c99"
+let g:base16_gui04 = "787c99"
+let s:gui05        = "a9b1d6"
+let g:base16_gui05 = "a9b1d6"
+let s:gui06        = "cbccd1"
+let g:base16_gui06 = "cbccd1"
+let s:gui07        = "d5d6db"
+let g:base16_gui07 = "d5d6db"
+let s:gui08        = "c0caf5"
+let g:base16_gui08 = "c0caf5"
+let s:gui09        = "a9b1d6"
+let g:base16_gui09 = "a9b1d6"
+let s:gui0A        = "0db9d7"
+let g:base16_gui0A = "0db9d7"
+let s:gui0B        = "9ece6a"
+let g:base16_gui0B = "9ece6a"
+let s:gui0C        = "b4f9f8"
+let g:base16_gui0C = "b4f9f8"
+let s:gui0D        = "2ac3de"
+let g:base16_gui0D = "2ac3de"
+let s:gui0E        = "bb9af7"
+let g:base16_gui0E = "bb9af7"
+let s:gui0F        = "f7768e"
+let g:base16_gui0F = "f7768e"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#1A1B26"
-  let g:terminal_color_1 =  "#C0CAF5"
-  let g:terminal_color_2 =  "#9ECE6A"
-  let g:terminal_color_3 =  "#0DB9D7"
-  let g:terminal_color_4 =  "#2AC3DE"
-  let g:terminal_color_5 =  "#BB9AF7"
-  let g:terminal_color_6 =  "#B4F9F8"
-  let g:terminal_color_7 =  "#A9B1D6"
-  let g:terminal_color_8 =  "#444B6A"
-  let g:terminal_color_9 =  "#C0CAF5"
-  let g:terminal_color_10 = "#9ECE6A"
-  let g:terminal_color_11 = "#0DB9D7"
-  let g:terminal_color_12 = "#2AC3DE"
-  let g:terminal_color_13 = "#BB9AF7"
-  let g:terminal_color_14 = "#B4F9F8"
-  let g:terminal_color_15 = "#D5D6DB"
+  let g:terminal_color_0 =  "#1a1b26"
+  let g:terminal_color_1 =  "#c0caf5"
+  let g:terminal_color_2 =  "#9ece6a"
+  let g:terminal_color_3 =  "#0db9d7"
+  let g:terminal_color_4 =  "#2ac3de"
+  let g:terminal_color_5 =  "#bb9af7"
+  let g:terminal_color_6 =  "#b4f9f8"
+  let g:terminal_color_7 =  "#a9b1d6"
+  let g:terminal_color_8 =  "#444b6a"
+  let g:terminal_color_9 =  "#c0caf5"
+  let g:terminal_color_10 = "#9ece6a"
+  let g:terminal_color_11 = "#0db9d7"
+  let g:terminal_color_12 = "#2ac3de"
+  let g:terminal_color_13 = "#bb9af7"
+  let g:terminal_color_14 = "#b4f9f8"
+  let g:terminal_color_15 = "#d5d6db"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#1A1B26",
-        \ "#C0CAF5",
-        \ "#9ECE6A",
-        \ "#0DB9D7",
-        \ "#2AC3DE",
-        \ "#BB9AF7",
-        \ "#B4F9F8",
-        \ "#A9B1D6",
-        \ "#444B6A",
-        \ "#C0CAF5",
-        \ "#9ECE6A",
-        \ "#0DB9D7",
-        \ "#2AC3DE",
-        \ "#BB9AF7",
-        \ "#B4F9F8",
-        \ "#D5D6DB",
+        \ "#1a1b26",
+        \ "#c0caf5",
+        \ "#9ece6a",
+        \ "#0db9d7",
+        \ "#2ac3de",
+        \ "#bb9af7",
+        \ "#b4f9f8",
+        \ "#a9b1d6",
+        \ "#444b6a",
+        \ "#c0caf5",
+        \ "#9ece6a",
+        \ "#0db9d7",
+        \ "#2ac3de",
+        \ "#bb9af7",
+        \ "#b4f9f8",
+        \ "#d5d6db",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-night-light.vim b/colors/base16-tokyo-night-light.vim
index 65ab565..de14907 100644
--- a/colors/base16-tokyo-night-light.vim
+++ b/colors/base16-tokyo-night-light.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "D5D6DB"
-let g:base16_gui00 = "D5D6DB"
-let s:gui01        = "CBCCD1"
-let g:base16_gui01 = "CBCCD1"
-let s:gui02        = "DFE0E5"
-let g:base16_gui02 = "DFE0E5"
-let s:gui03        = "9699A3"
-let g:base16_gui03 = "9699A3"
-let s:gui04        = "4C505E"
-let g:base16_gui04 = "4C505E"
-let s:gui05        = "343B59"
-let g:base16_gui05 = "343B59"
-let s:gui06        = "1A1B26"
-let g:base16_gui06 = "1A1B26"
-let s:gui07        = "1A1B26"
-let g:base16_gui07 = "1A1B26"
-let s:gui08        = "343B58"
-let g:base16_gui08 = "343B58"
+let s:gui00        = "d5d6db"
+let g:base16_gui00 = "d5d6db"
+let s:gui01        = "cbccd1"
+let g:base16_gui01 = "cbccd1"
+let s:gui02        = "dfe0e5"
+let g:base16_gui02 = "dfe0e5"
+let s:gui03        = "9699a3"
+let g:base16_gui03 = "9699a3"
+let s:gui04        = "4c505e"
+let g:base16_gui04 = "4c505e"
+let s:gui05        = "343b59"
+let g:base16_gui05 = "343b59"
+let s:gui06        = "1a1b26"
+let g:base16_gui06 = "1a1b26"
+let s:gui07        = "1a1b26"
+let g:base16_gui07 = "1a1b26"
+let s:gui08        = "343b58"
+let g:base16_gui08 = "343b58"
 let s:gui09        = "965027"
 let g:base16_gui09 = "965027"
 let s:gui0A        = "166775"
 let g:base16_gui0A = "166775"
-let s:gui0B        = "485E30"
-let g:base16_gui0B = "485E30"
-let s:gui0C        = "3E6968"
-let g:base16_gui0C = "3E6968"
-let s:gui0D        = "34548A"
-let g:base16_gui0D = "34548A"
-let s:gui0E        = "5A4A78"
-let g:base16_gui0E = "5A4A78"
-let s:gui0F        = "8C4351"
-let g:base16_gui0F = "8C4351"
+let s:gui0B        = "485e30"
+let g:base16_gui0B = "485e30"
+let s:gui0C        = "3e6968"
+let g:base16_gui0C = "3e6968"
+let s:gui0D        = "34548a"
+let g:base16_gui0D = "34548a"
+let s:gui0E        = "5a4a78"
+let g:base16_gui0E = "5a4a78"
+let s:gui0F        = "8c4351"
+let g:base16_gui0F = "8c4351"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#D5D6DB"
-  let g:terminal_color_1 =  "#343B58"
-  let g:terminal_color_2 =  "#485E30"
+  let g:terminal_color_0 =  "#d5d6db"
+  let g:terminal_color_1 =  "#343b58"
+  let g:terminal_color_2 =  "#485e30"
   let g:terminal_color_3 =  "#166775"
-  let g:terminal_color_4 =  "#34548A"
-  let g:terminal_color_5 =  "#5A4A78"
-  let g:terminal_color_6 =  "#3E6968"
-  let g:terminal_color_7 =  "#343B59"
-  let g:terminal_color_8 =  "#9699A3"
-  let g:terminal_color_9 =  "#343B58"
-  let g:terminal_color_10 = "#485E30"
+  let g:terminal_color_4 =  "#34548a"
+  let g:terminal_color_5 =  "#5a4a78"
+  let g:terminal_color_6 =  "#3e6968"
+  let g:terminal_color_7 =  "#343b59"
+  let g:terminal_color_8 =  "#9699a3"
+  let g:terminal_color_9 =  "#343b58"
+  let g:terminal_color_10 = "#485e30"
   let g:terminal_color_11 = "#166775"
-  let g:terminal_color_12 = "#34548A"
-  let g:terminal_color_13 = "#5A4A78"
-  let g:terminal_color_14 = "#3E6968"
-  let g:terminal_color_15 = "#1A1B26"
+  let g:terminal_color_12 = "#34548a"
+  let g:terminal_color_13 = "#5a4a78"
+  let g:terminal_color_14 = "#3e6968"
+  let g:terminal_color_15 = "#1a1b26"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#D5D6DB",
-        \ "#343B58",
-        \ "#485E30",
+        \ "#d5d6db",
+        \ "#343b58",
+        \ "#485e30",
         \ "#166775",
-        \ "#34548A",
-        \ "#5A4A78",
-        \ "#3E6968",
-        \ "#343B59",
-        \ "#9699A3",
-        \ "#343B58",
-        \ "#485E30",
+        \ "#34548a",
+        \ "#5a4a78",
+        \ "#3e6968",
+        \ "#343b59",
+        \ "#9699a3",
+        \ "#343b58",
+        \ "#485e30",
         \ "#166775",
-        \ "#34548A",
-        \ "#5A4A78",
-        \ "#3E6968",
-        \ "#1A1B26",
+        \ "#34548a",
+        \ "#5a4a78",
+        \ "#3e6968",
+        \ "#1a1b26",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-night-storm.vim b/colors/base16-tokyo-night-storm.vim
index 358f4aa..7b0d006 100644
--- a/colors/base16-tokyo-night-storm.vim
+++ b/colors/base16-tokyo-night-storm.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "24283B"
-let g:base16_gui00 = "24283B"
-let s:gui01        = "16161E"
-let g:base16_gui01 = "16161E"
-let s:gui02        = "343A52"
-let g:base16_gui02 = "343A52"
-let s:gui03        = "444B6A"
-let g:base16_gui03 = "444B6A"
-let s:gui04        = "787C99"
-let g:base16_gui04 = "787C99"
-let s:gui05        = "A9B1D6"
-let g:base16_gui05 = "A9B1D6"
-let s:gui06        = "CBCCD1"
-let g:base16_gui06 = "CBCCD1"
-let s:gui07        = "D5D6DB"
-let g:base16_gui07 = "D5D6DB"
-let s:gui08        = "C0CAF5"
-let g:base16_gui08 = "C0CAF5"
-let s:gui09        = "A9B1D6"
-let g:base16_gui09 = "A9B1D6"
-let s:gui0A        = "0DB9D7"
-let g:base16_gui0A = "0DB9D7"
-let s:gui0B        = "9ECE6A"
-let g:base16_gui0B = "9ECE6A"
-let s:gui0C        = "B4F9F8"
-let g:base16_gui0C = "B4F9F8"
-let s:gui0D        = "2AC3DE"
-let g:base16_gui0D = "2AC3DE"
-let s:gui0E        = "BB9AF7"
-let g:base16_gui0E = "BB9AF7"
-let s:gui0F        = "F7768E"
-let g:base16_gui0F = "F7768E"
+let s:gui00        = "24283b"
+let g:base16_gui00 = "24283b"
+let s:gui01        = "16161e"
+let g:base16_gui01 = "16161e"
+let s:gui02        = "343a52"
+let g:base16_gui02 = "343a52"
+let s:gui03        = "444b6a"
+let g:base16_gui03 = "444b6a"
+let s:gui04        = "787c99"
+let g:base16_gui04 = "787c99"
+let s:gui05        = "a9b1d6"
+let g:base16_gui05 = "a9b1d6"
+let s:gui06        = "cbccd1"
+let g:base16_gui06 = "cbccd1"
+let s:gui07        = "d5d6db"
+let g:base16_gui07 = "d5d6db"
+let s:gui08        = "c0caf5"
+let g:base16_gui08 = "c0caf5"
+let s:gui09        = "a9b1d6"
+let g:base16_gui09 = "a9b1d6"
+let s:gui0A        = "0db9d7"
+let g:base16_gui0A = "0db9d7"
+let s:gui0B        = "9ece6a"
+let g:base16_gui0B = "9ece6a"
+let s:gui0C        = "b4f9f8"
+let g:base16_gui0C = "b4f9f8"
+let s:gui0D        = "2ac3de"
+let g:base16_gui0D = "2ac3de"
+let s:gui0E        = "bb9af7"
+let g:base16_gui0E = "bb9af7"
+let s:gui0F        = "f7768e"
+let g:base16_gui0F = "f7768e"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#24283B"
-  let g:terminal_color_1 =  "#C0CAF5"
-  let g:terminal_color_2 =  "#9ECE6A"
-  let g:terminal_color_3 =  "#0DB9D7"
-  let g:terminal_color_4 =  "#2AC3DE"
-  let g:terminal_color_5 =  "#BB9AF7"
-  let g:terminal_color_6 =  "#B4F9F8"
-  let g:terminal_color_7 =  "#A9B1D6"
-  let g:terminal_color_8 =  "#444B6A"
-  let g:terminal_color_9 =  "#C0CAF5"
-  let g:terminal_color_10 = "#9ECE6A"
-  let g:terminal_color_11 = "#0DB9D7"
-  let g:terminal_color_12 = "#2AC3DE"
-  let g:terminal_color_13 = "#BB9AF7"
-  let g:terminal_color_14 = "#B4F9F8"
-  let g:terminal_color_15 = "#D5D6DB"
+  let g:terminal_color_0 =  "#24283b"
+  let g:terminal_color_1 =  "#c0caf5"
+  let g:terminal_color_2 =  "#9ece6a"
+  let g:terminal_color_3 =  "#0db9d7"
+  let g:terminal_color_4 =  "#2ac3de"
+  let g:terminal_color_5 =  "#bb9af7"
+  let g:terminal_color_6 =  "#b4f9f8"
+  let g:terminal_color_7 =  "#a9b1d6"
+  let g:terminal_color_8 =  "#444b6a"
+  let g:terminal_color_9 =  "#c0caf5"
+  let g:terminal_color_10 = "#9ece6a"
+  let g:terminal_color_11 = "#0db9d7"
+  let g:terminal_color_12 = "#2ac3de"
+  let g:terminal_color_13 = "#bb9af7"
+  let g:terminal_color_14 = "#b4f9f8"
+  let g:terminal_color_15 = "#d5d6db"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#24283B",
-        \ "#C0CAF5",
-        \ "#9ECE6A",
-        \ "#0DB9D7",
-        \ "#2AC3DE",
-        \ "#BB9AF7",
-        \ "#B4F9F8",
-        \ "#A9B1D6",
-        \ "#444B6A",
-        \ "#C0CAF5",
-        \ "#9ECE6A",
-        \ "#0DB9D7",
-        \ "#2AC3DE",
-        \ "#BB9AF7",
-        \ "#B4F9F8",
-        \ "#D5D6DB",
+        \ "#24283b",
+        \ "#c0caf5",
+        \ "#9ece6a",
+        \ "#0db9d7",
+        \ "#2ac3de",
+        \ "#bb9af7",
+        \ "#b4f9f8",
+        \ "#a9b1d6",
+        \ "#444b6a",
+        \ "#c0caf5",
+        \ "#9ece6a",
+        \ "#0db9d7",
+        \ "#2ac3de",
+        \ "#bb9af7",
+        \ "#b4f9f8",
+        \ "#d5d6db",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-night-terminal-dark.vim b/colors/base16-tokyo-night-terminal-dark.vim
index 6908f8f..f887c9d 100644
--- a/colors/base16-tokyo-night-terminal-dark.vim
+++ b/colors/base16-tokyo-night-terminal-dark.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "16161E"
-let g:base16_gui00 = "16161E"
-let s:gui01        = "1A1B26"
-let g:base16_gui01 = "1A1B26"
-let s:gui02        = "2F3549"
-let g:base16_gui02 = "2F3549"
-let s:gui03        = "444B6A"
-let g:base16_gui03 = "444B6A"
-let s:gui04        = "787C99"
-let g:base16_gui04 = "787C99"
-let s:gui05        = "787C99"
-let g:base16_gui05 = "787C99"
-let s:gui06        = "CBCCD1"
-let g:base16_gui06 = "CBCCD1"
-let s:gui07        = "D5D6DB"
-let g:base16_gui07 = "D5D6DB"
-let s:gui08        = "F7768E"
-let g:base16_gui08 = "F7768E"
-let s:gui09        = "FF9E64"
-let g:base16_gui09 = "FF9E64"
-let s:gui0A        = "E0AF68"
-let g:base16_gui0A = "E0AF68"
-let s:gui0B        = "41A6B5"
-let g:base16_gui0B = "41A6B5"
-let s:gui0C        = "7DCFFF"
-let g:base16_gui0C = "7DCFFF"
-let s:gui0D        = "7AA2F7"
-let g:base16_gui0D = "7AA2F7"
-let s:gui0E        = "BB9AF7"
-let g:base16_gui0E = "BB9AF7"
-let s:gui0F        = "D18616"
-let g:base16_gui0F = "D18616"
+let s:gui00        = "16161e"
+let g:base16_gui00 = "16161e"
+let s:gui01        = "1a1b26"
+let g:base16_gui01 = "1a1b26"
+let s:gui02        = "2f3549"
+let g:base16_gui02 = "2f3549"
+let s:gui03        = "444b6a"
+let g:base16_gui03 = "444b6a"
+let s:gui04        = "787c99"
+let g:base16_gui04 = "787c99"
+let s:gui05        = "787c99"
+let g:base16_gui05 = "787c99"
+let s:gui06        = "cbccd1"
+let g:base16_gui06 = "cbccd1"
+let s:gui07        = "d5d6db"
+let g:base16_gui07 = "d5d6db"
+let s:gui08        = "f7768e"
+let g:base16_gui08 = "f7768e"
+let s:gui09        = "ff9e64"
+let g:base16_gui09 = "ff9e64"
+let s:gui0A        = "e0af68"
+let g:base16_gui0A = "e0af68"
+let s:gui0B        = "41a6b5"
+let g:base16_gui0B = "41a6b5"
+let s:gui0C        = "7dcfff"
+let g:base16_gui0C = "7dcfff"
+let s:gui0D        = "7aa2f7"
+let g:base16_gui0D = "7aa2f7"
+let s:gui0E        = "bb9af7"
+let g:base16_gui0E = "bb9af7"
+let s:gui0F        = "d18616"
+let g:base16_gui0F = "d18616"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#16161E"
-  let g:terminal_color_1 =  "#F7768E"
-  let g:terminal_color_2 =  "#41A6B5"
-  let g:terminal_color_3 =  "#E0AF68"
-  let g:terminal_color_4 =  "#7AA2F7"
-  let g:terminal_color_5 =  "#BB9AF7"
-  let g:terminal_color_6 =  "#7DCFFF"
-  let g:terminal_color_7 =  "#787C99"
-  let g:terminal_color_8 =  "#444B6A"
-  let g:terminal_color_9 =  "#F7768E"
-  let g:terminal_color_10 = "#41A6B5"
-  let g:terminal_color_11 = "#E0AF68"
-  let g:terminal_color_12 = "#7AA2F7"
-  let g:terminal_color_13 = "#BB9AF7"
-  let g:terminal_color_14 = "#7DCFFF"
-  let g:terminal_color_15 = "#D5D6DB"
+  let g:terminal_color_0 =  "#16161e"
+  let g:terminal_color_1 =  "#f7768e"
+  let g:terminal_color_2 =  "#41a6b5"
+  let g:terminal_color_3 =  "#e0af68"
+  let g:terminal_color_4 =  "#7aa2f7"
+  let g:terminal_color_5 =  "#bb9af7"
+  let g:terminal_color_6 =  "#7dcfff"
+  let g:terminal_color_7 =  "#787c99"
+  let g:terminal_color_8 =  "#444b6a"
+  let g:terminal_color_9 =  "#f7768e"
+  let g:terminal_color_10 = "#41a6b5"
+  let g:terminal_color_11 = "#e0af68"
+  let g:terminal_color_12 = "#7aa2f7"
+  let g:terminal_color_13 = "#bb9af7"
+  let g:terminal_color_14 = "#7dcfff"
+  let g:terminal_color_15 = "#d5d6db"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#16161E",
-        \ "#F7768E",
-        \ "#41A6B5",
-        \ "#E0AF68",
-        \ "#7AA2F7",
-        \ "#BB9AF7",
-        \ "#7DCFFF",
-        \ "#787C99",
-        \ "#444B6A",
-        \ "#F7768E",
-        \ "#41A6B5",
-        \ "#E0AF68",
-        \ "#7AA2F7",
-        \ "#BB9AF7",
-        \ "#7DCFFF",
-        \ "#D5D6DB",
+        \ "#16161e",
+        \ "#f7768e",
+        \ "#41a6b5",
+        \ "#e0af68",
+        \ "#7aa2f7",
+        \ "#bb9af7",
+        \ "#7dcfff",
+        \ "#787c99",
+        \ "#444b6a",
+        \ "#f7768e",
+        \ "#41a6b5",
+        \ "#e0af68",
+        \ "#7aa2f7",
+        \ "#bb9af7",
+        \ "#7dcfff",
+        \ "#d5d6db",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-night-terminal-light.vim b/colors/base16-tokyo-night-terminal-light.vim
index d5b375b..29c5d62 100644
--- a/colors/base16-tokyo-night-terminal-light.vim
+++ b/colors/base16-tokyo-night-terminal-light.vim
@@ -15,36 +15,36 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "D5D6DB"
-let g:base16_gui00 = "D5D6DB"
-let s:gui01        = "CBCCD1"
-let g:base16_gui01 = "CBCCD1"
-let s:gui02        = "DFE0E5"
-let g:base16_gui02 = "DFE0E5"
-let s:gui03        = "9699A3"
-let g:base16_gui03 = "9699A3"
-let s:gui04        = "4C505E"
-let g:base16_gui04 = "4C505E"
-let s:gui05        = "4C505E"
-let g:base16_gui05 = "4C505E"
-let s:gui06        = "1A1B26"
-let g:base16_gui06 = "1A1B26"
-let s:gui07        = "1A1B26"
-let g:base16_gui07 = "1A1B26"
-let s:gui08        = "8C4351"
-let g:base16_gui08 = "8C4351"
+let s:gui00        = "d5d6db"
+let g:base16_gui00 = "d5d6db"
+let s:gui01        = "cbccd1"
+let g:base16_gui01 = "cbccd1"
+let s:gui02        = "dfe0e5"
+let g:base16_gui02 = "dfe0e5"
+let s:gui03        = "9699a3"
+let g:base16_gui03 = "9699a3"
+let s:gui04        = "4c505e"
+let g:base16_gui04 = "4c505e"
+let s:gui05        = "4c505e"
+let g:base16_gui05 = "4c505e"
+let s:gui06        = "1a1b26"
+let g:base16_gui06 = "1a1b26"
+let s:gui07        = "1a1b26"
+let g:base16_gui07 = "1a1b26"
+let s:gui08        = "8c4351"
+let g:base16_gui08 = "8c4351"
 let s:gui09        = "965027"
 let g:base16_gui09 = "965027"
-let s:gui0A        = "8F5E15"
-let g:base16_gui0A = "8F5E15"
-let s:gui0B        = "33635C"
-let g:base16_gui0B = "33635C"
-let s:gui0C        = "0F4B6E"
-let g:base16_gui0C = "0F4B6E"
-let s:gui0D        = "34548A"
-let g:base16_gui0D = "34548A"
-let s:gui0E        = "5A4A78"
-let g:base16_gui0E = "5A4A78"
+let s:gui0A        = "8f5e15"
+let g:base16_gui0A = "8f5e15"
+let s:gui0B        = "33635c"
+let g:base16_gui0B = "33635c"
+let s:gui0C        = "0f4b6e"
+let g:base16_gui0C = "0f4b6e"
+let s:gui0D        = "34548a"
+let g:base16_gui0D = "34548a"
+let s:gui0E        = "5a4a78"
+let g:base16_gui0E = "5a4a78"
 let s:gui0F        = "655259"
 let g:base16_gui0F = "655259"
 
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#D5D6DB"
-  let g:terminal_color_1 =  "#8C4351"
-  let g:terminal_color_2 =  "#33635C"
-  let g:terminal_color_3 =  "#8F5E15"
-  let g:terminal_color_4 =  "#34548A"
-  let g:terminal_color_5 =  "#5A4A78"
-  let g:terminal_color_6 =  "#0F4B6E"
-  let g:terminal_color_7 =  "#4C505E"
-  let g:terminal_color_8 =  "#9699A3"
-  let g:terminal_color_9 =  "#8C4351"
-  let g:terminal_color_10 = "#33635C"
-  let g:terminal_color_11 = "#8F5E15"
-  let g:terminal_color_12 = "#34548A"
-  let g:terminal_color_13 = "#5A4A78"
-  let g:terminal_color_14 = "#0F4B6E"
-  let g:terminal_color_15 = "#1A1B26"
+  let g:terminal_color_0 =  "#d5d6db"
+  let g:terminal_color_1 =  "#8c4351"
+  let g:terminal_color_2 =  "#33635c"
+  let g:terminal_color_3 =  "#8f5e15"
+  let g:terminal_color_4 =  "#34548a"
+  let g:terminal_color_5 =  "#5a4a78"
+  let g:terminal_color_6 =  "#0f4b6e"
+  let g:terminal_color_7 =  "#4c505e"
+  let g:terminal_color_8 =  "#9699a3"
+  let g:terminal_color_9 =  "#8c4351"
+  let g:terminal_color_10 = "#33635c"
+  let g:terminal_color_11 = "#8f5e15"
+  let g:terminal_color_12 = "#34548a"
+  let g:terminal_color_13 = "#5a4a78"
+  let g:terminal_color_14 = "#0f4b6e"
+  let g:terminal_color_15 = "#1a1b26"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#D5D6DB",
-        \ "#8C4351",
-        \ "#33635C",
-        \ "#8F5E15",
-        \ "#34548A",
-        \ "#5A4A78",
-        \ "#0F4B6E",
-        \ "#4C505E",
-        \ "#9699A3",
-        \ "#8C4351",
-        \ "#33635C",
-        \ "#8F5E15",
-        \ "#34548A",
-        \ "#5A4A78",
-        \ "#0F4B6E",
-        \ "#1A1B26",
+        \ "#d5d6db",
+        \ "#8c4351",
+        \ "#33635c",
+        \ "#8f5e15",
+        \ "#34548a",
+        \ "#5a4a78",
+        \ "#0f4b6e",
+        \ "#4c505e",
+        \ "#9699a3",
+        \ "#8c4351",
+        \ "#33635c",
+        \ "#8f5e15",
+        \ "#34548a",
+        \ "#5a4a78",
+        \ "#0f4b6e",
+        \ "#1a1b26",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyo-night-terminal-storm.vim b/colors/base16-tokyo-night-terminal-storm.vim
index b767806..50dbbe5 100644
--- a/colors/base16-tokyo-night-terminal-storm.vim
+++ b/colors/base16-tokyo-night-terminal-storm.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "24283B"
-let g:base16_gui00 = "24283B"
-let s:gui01        = "1A1B26"
-let g:base16_gui01 = "1A1B26"
-let s:gui02        = "343A52"
-let g:base16_gui02 = "343A52"
-let s:gui03        = "444B6A"
-let g:base16_gui03 = "444B6A"
-let s:gui04        = "787C99"
-let g:base16_gui04 = "787C99"
-let s:gui05        = "787C99"
-let g:base16_gui05 = "787C99"
-let s:gui06        = "CBCCD1"
-let g:base16_gui06 = "CBCCD1"
-let s:gui07        = "D5D6DB"
-let g:base16_gui07 = "D5D6DB"
-let s:gui08        = "F7768E"
-let g:base16_gui08 = "F7768E"
-let s:gui09        = "FF9E64"
-let g:base16_gui09 = "FF9E64"
-let s:gui0A        = "E0AF68"
-let g:base16_gui0A = "E0AF68"
-let s:gui0B        = "41A6B5"
-let g:base16_gui0B = "41A6B5"
-let s:gui0C        = "7DCFFF"
-let g:base16_gui0C = "7DCFFF"
-let s:gui0D        = "7AA2F7"
-let g:base16_gui0D = "7AA2F7"
-let s:gui0E        = "BB9AF7"
-let g:base16_gui0E = "BB9AF7"
-let s:gui0F        = "D18616"
-let g:base16_gui0F = "D18616"
+let s:gui00        = "24283b"
+let g:base16_gui00 = "24283b"
+let s:gui01        = "1a1b26"
+let g:base16_gui01 = "1a1b26"
+let s:gui02        = "343a52"
+let g:base16_gui02 = "343a52"
+let s:gui03        = "444b6a"
+let g:base16_gui03 = "444b6a"
+let s:gui04        = "787c99"
+let g:base16_gui04 = "787c99"
+let s:gui05        = "787c99"
+let g:base16_gui05 = "787c99"
+let s:gui06        = "cbccd1"
+let g:base16_gui06 = "cbccd1"
+let s:gui07        = "d5d6db"
+let g:base16_gui07 = "d5d6db"
+let s:gui08        = "f7768e"
+let g:base16_gui08 = "f7768e"
+let s:gui09        = "ff9e64"
+let g:base16_gui09 = "ff9e64"
+let s:gui0A        = "e0af68"
+let g:base16_gui0A = "e0af68"
+let s:gui0B        = "41a6b5"
+let g:base16_gui0B = "41a6b5"
+let s:gui0C        = "7dcfff"
+let g:base16_gui0C = "7dcfff"
+let s:gui0D        = "7aa2f7"
+let g:base16_gui0D = "7aa2f7"
+let s:gui0E        = "bb9af7"
+let g:base16_gui0E = "bb9af7"
+let s:gui0F        = "d18616"
+let g:base16_gui0F = "d18616"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#24283B"
-  let g:terminal_color_1 =  "#F7768E"
-  let g:terminal_color_2 =  "#41A6B5"
-  let g:terminal_color_3 =  "#E0AF68"
-  let g:terminal_color_4 =  "#7AA2F7"
-  let g:terminal_color_5 =  "#BB9AF7"
-  let g:terminal_color_6 =  "#7DCFFF"
-  let g:terminal_color_7 =  "#787C99"
-  let g:terminal_color_8 =  "#444B6A"
-  let g:terminal_color_9 =  "#F7768E"
-  let g:terminal_color_10 = "#41A6B5"
-  let g:terminal_color_11 = "#E0AF68"
-  let g:terminal_color_12 = "#7AA2F7"
-  let g:terminal_color_13 = "#BB9AF7"
-  let g:terminal_color_14 = "#7DCFFF"
-  let g:terminal_color_15 = "#D5D6DB"
+  let g:terminal_color_0 =  "#24283b"
+  let g:terminal_color_1 =  "#f7768e"
+  let g:terminal_color_2 =  "#41a6b5"
+  let g:terminal_color_3 =  "#e0af68"
+  let g:terminal_color_4 =  "#7aa2f7"
+  let g:terminal_color_5 =  "#bb9af7"
+  let g:terminal_color_6 =  "#7dcfff"
+  let g:terminal_color_7 =  "#787c99"
+  let g:terminal_color_8 =  "#444b6a"
+  let g:terminal_color_9 =  "#f7768e"
+  let g:terminal_color_10 = "#41a6b5"
+  let g:terminal_color_11 = "#e0af68"
+  let g:terminal_color_12 = "#7aa2f7"
+  let g:terminal_color_13 = "#bb9af7"
+  let g:terminal_color_14 = "#7dcfff"
+  let g:terminal_color_15 = "#d5d6db"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#24283B",
-        \ "#F7768E",
-        \ "#41A6B5",
-        \ "#E0AF68",
-        \ "#7AA2F7",
-        \ "#BB9AF7",
-        \ "#7DCFFF",
-        \ "#787C99",
-        \ "#444B6A",
-        \ "#F7768E",
-        \ "#41A6B5",
-        \ "#E0AF68",
-        \ "#7AA2F7",
-        \ "#BB9AF7",
-        \ "#7DCFFF",
-        \ "#D5D6DB",
+        \ "#24283b",
+        \ "#f7768e",
+        \ "#41a6b5",
+        \ "#e0af68",
+        \ "#7aa2f7",
+        \ "#bb9af7",
+        \ "#7dcfff",
+        \ "#787c99",
+        \ "#444b6a",
+        \ "#f7768e",
+        \ "#41a6b5",
+        \ "#e0af68",
+        \ "#7aa2f7",
+        \ "#bb9af7",
+        \ "#7dcfff",
+        \ "#d5d6db",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-tokyodark-terminal.vim b/colors/base16-tokyodark-terminal.vim
new file mode 100644
index 0000000..451f8f5
--- /dev/null
+++ b/colors/base16-tokyodark-terminal.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Tokyodark Terminal scheme by Tiagovla (https://github.com/tiagovla/)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-tokyodark-terminal.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "11121d"
+let g:base16_gui00 = "11121d"
+let s:gui01        = "1a1b2a"
+let g:base16_gui01 = "1a1b2a"
+let s:gui02        = "212234"
+let g:base16_gui02 = "212234"
+let s:gui03        = "282c34"
+let g:base16_gui03 = "282c34"
+let s:gui04        = "4a5057"
+let g:base16_gui04 = "4a5057"
+let s:gui05        = "a0a8cd"
+let g:base16_gui05 = "a0a8cd"
+let s:gui06        = "a0a8cd"
+let g:base16_gui06 = "a0a8cd"
+let s:gui07        = "a0a8cd"
+let g:base16_gui07 = "a0a8cd"
+let s:gui08        = "ee6d85"
+let g:base16_gui08 = "ee6d85"
+let s:gui09        = "f6955b"
+let g:base16_gui09 = "f6955b"
+let s:gui0A        = "d7a65f"
+let g:base16_gui0A = "d7a65f"
+let s:gui0B        = "95c561"
+let g:base16_gui0B = "95c561"
+let s:gui0C        = "38a89d"
+let g:base16_gui0C = "38a89d"
+let s:gui0D        = "7199ee"
+let g:base16_gui0D = "7199ee"
+let s:gui0E        = "a485dd"
+let g:base16_gui0E = "a485dd"
+let s:gui0F        = "773440"
+let g:base16_gui0F = "773440"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#11121d"
+  let g:terminal_color_1 =  "#ee6d85"
+  let g:terminal_color_2 =  "#95c561"
+  let g:terminal_color_3 =  "#d7a65f"
+  let g:terminal_color_4 =  "#7199ee"
+  let g:terminal_color_5 =  "#a485dd"
+  let g:terminal_color_6 =  "#38a89d"
+  let g:terminal_color_7 =  "#a0a8cd"
+  let g:terminal_color_8 =  "#282c34"
+  let g:terminal_color_9 =  "#ee6d85"
+  let g:terminal_color_10 = "#95c561"
+  let g:terminal_color_11 = "#d7a65f"
+  let g:terminal_color_12 = "#7199ee"
+  let g:terminal_color_13 = "#a485dd"
+  let g:terminal_color_14 = "#38a89d"
+  let g:terminal_color_15 = "#a0a8cd"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#11121d",
+        \ "#ee6d85",
+        \ "#95c561",
+        \ "#d7a65f",
+        \ "#7199ee",
+        \ "#a485dd",
+        \ "#38a89d",
+        \ "#a0a8cd",
+        \ "#282c34",
+        \ "#ee6d85",
+        \ "#95c561",
+        \ "#d7a65f",
+        \ "#7199ee",
+        \ "#a485dd",
+        \ "#38a89d",
+        \ "#a0a8cd",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-tokyodark-terminal"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-tokyodark.vim b/colors/base16-tokyodark.vim
new file mode 100644
index 0000000..79e3ad1
--- /dev/null
+++ b/colors/base16-tokyodark.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Tokyodark scheme by Tiagovla (https://github.com/tiagovla/)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-tokyodark.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "11121d"
+let g:base16_gui00 = "11121d"
+let s:gui01        = "151621"
+let g:base16_gui01 = "151621"
+let s:gui02        = "43444f"
+let g:base16_gui02 = "43444f"
+let s:gui03        = "393a45"
+let g:base16_gui03 = "393a45"
+let s:gui04        = "1b1c27"
+let g:base16_gui04 = "1b1c27"
+let s:gui05        = "abb2bf"
+let g:base16_gui05 = "abb2bf"
+let s:gui06        = "555661"
+let g:base16_gui06 = "555661"
+let s:gui07        = "2c2d38"
+let g:base16_gui07 = "2c2d38"
+let s:gui08        = "a485dd"
+let g:base16_gui08 = "a485dd"
+let s:gui09        = "a485dd"
+let g:base16_gui09 = "a485dd"
+let s:gui0A        = "7199ee"
+let g:base16_gui0A = "7199ee"
+let s:gui0B        = "d7a65f"
+let g:base16_gui0B = "d7a65f"
+let s:gui0C        = "a485dd"
+let g:base16_gui0C = "a485dd"
+let s:gui0D        = "95c561"
+let g:base16_gui0D = "95c561"
+let s:gui0E        = "ee6d85"
+let g:base16_gui0E = "ee6d85"
+let s:gui0F        = "773440"
+let g:base16_gui0F = "773440"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#11121d"
+  let g:terminal_color_1 =  "#a485dd"
+  let g:terminal_color_2 =  "#d7a65f"
+  let g:terminal_color_3 =  "#7199ee"
+  let g:terminal_color_4 =  "#95c561"
+  let g:terminal_color_5 =  "#ee6d85"
+  let g:terminal_color_6 =  "#a485dd"
+  let g:terminal_color_7 =  "#abb2bf"
+  let g:terminal_color_8 =  "#393a45"
+  let g:terminal_color_9 =  "#a485dd"
+  let g:terminal_color_10 = "#d7a65f"
+  let g:terminal_color_11 = "#7199ee"
+  let g:terminal_color_12 = "#95c561"
+  let g:terminal_color_13 = "#ee6d85"
+  let g:terminal_color_14 = "#a485dd"
+  let g:terminal_color_15 = "#2c2d38"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#11121d",
+        \ "#a485dd",
+        \ "#d7a65f",
+        \ "#7199ee",
+        \ "#95c561",
+        \ "#ee6d85",
+        \ "#a485dd",
+        \ "#abb2bf",
+        \ "#393a45",
+        \ "#a485dd",
+        \ "#d7a65f",
+        \ "#7199ee",
+        \ "#95c561",
+        \ "#ee6d85",
+        \ "#a485dd",
+        \ "#2c2d38",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-tokyodark"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-tomorrow-night-eighties.vim b/colors/base16-tomorrow-night-eighties.vim
index 5704157..af755ca 100644
--- a/colors/base16-tomorrow-night-eighties.vim
+++ b/colors/base16-tomorrow-night-eighties.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim
index 6f5c680..8cbdd32 100644
--- a/colors/base16-tomorrow-night.vim
+++ b/colors/base16-tomorrow-night.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 284e192..76d10fa 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim
index 8e0f9a8..8118919 100644
--- a/colors/base16-tube.vim
+++ b/colors/base16-tube.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index bdf45dd..dafcce7 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim
index d64cad3..0b06804 100644
--- a/colors/base16-unikitty-dark.vim
+++ b/colors/base16-unikitty-dark.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim
index 9b724b1..3ee06b0 100644
--- a/colors/base16-unikitty-light.vim
+++ b/colors/base16-unikitty-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-unikitty-reversible.vim b/colors/base16-unikitty-reversible.vim
new file mode 100644
index 0000000..751208f
--- /dev/null
+++ b/colors/base16-unikitty-reversible.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Unikitty Reversible scheme by Josh W Lewis (@joshwlewis)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-unikitty-reversible.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "2e2a31"
+let g:base16_gui00 = "2e2a31"
+let s:gui01        = "4b484e"
+let g:base16_gui01 = "4b484e"
+let s:gui02        = "69666b"
+let g:base16_gui02 = "69666b"
+let s:gui03        = "878589"
+let g:base16_gui03 = "878589"
+let s:gui04        = "a5a3a6"
+let g:base16_gui04 = "a5a3a6"
+let s:gui05        = "c3c2c4"
+let g:base16_gui05 = "c3c2c4"
+let s:gui06        = "e1e0e1"
+let g:base16_gui06 = "e1e0e1"
+let s:gui07        = "ffffff"
+let g:base16_gui07 = "ffffff"
+let s:gui08        = "d8137f"
+let g:base16_gui08 = "d8137f"
+let s:gui09        = "d65407"
+let g:base16_gui09 = "d65407"
+let s:gui0A        = "dc8a0e"
+let g:base16_gui0A = "dc8a0e"
+let s:gui0B        = "17ad98"
+let g:base16_gui0B = "17ad98"
+let s:gui0C        = "149bda"
+let g:base16_gui0C = "149bda"
+let s:gui0D        = "7864fa"
+let g:base16_gui0D = "7864fa"
+let s:gui0E        = "b33ce8"
+let g:base16_gui0E = "b33ce8"
+let s:gui0F        = "d41acd"
+let g:base16_gui0F = "d41acd"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#2e2a31"
+  let g:terminal_color_1 =  "#d8137f"
+  let g:terminal_color_2 =  "#17ad98"
+  let g:terminal_color_3 =  "#dc8a0e"
+  let g:terminal_color_4 =  "#7864fa"
+  let g:terminal_color_5 =  "#b33ce8"
+  let g:terminal_color_6 =  "#149bda"
+  let g:terminal_color_7 =  "#c3c2c4"
+  let g:terminal_color_8 =  "#878589"
+  let g:terminal_color_9 =  "#d8137f"
+  let g:terminal_color_10 = "#17ad98"
+  let g:terminal_color_11 = "#dc8a0e"
+  let g:terminal_color_12 = "#7864fa"
+  let g:terminal_color_13 = "#b33ce8"
+  let g:terminal_color_14 = "#149bda"
+  let g:terminal_color_15 = "#ffffff"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#2e2a31",
+        \ "#d8137f",
+        \ "#17ad98",
+        \ "#dc8a0e",
+        \ "#7864fa",
+        \ "#b33ce8",
+        \ "#149bda",
+        \ "#c3c2c4",
+        \ "#878589",
+        \ "#d8137f",
+        \ "#17ad98",
+        \ "#dc8a0e",
+        \ "#7864fa",
+        \ "#b33ce8",
+        \ "#149bda",
+        \ "#ffffff",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-unikitty-reversible"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-uwunicorn.vim b/colors/base16-uwunicorn.vim
new file mode 100644
index 0000000..d2b00a6
--- /dev/null
+++ b/colors/base16-uwunicorn.vim
@@ -0,0 +1,629 @@
+" vi:syntax=vim
+
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" UwUnicorn scheme by Fernando Marques (https://github.com/RakkiUwU) and Gabriel Fontes (https://github.com/Misterio77)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+"   let g:base16_shell_path=base16-builder/output/shell/
+if !has("gui_running")
+  if exists("g:base16_shell_path")
+    execute "silent !/bin/sh ".g:base16_shell_path."/base16-uwunicorn.sh"
+  endif
+endif
+
+" GUI color definitions
+let s:gui00        = "241b26"
+let g:base16_gui00 = "241b26"
+let s:gui01        = "2f2a3f"
+let g:base16_gui01 = "2f2a3f"
+let s:gui02        = "46354a"
+let g:base16_gui02 = "46354a"
+let s:gui03        = "6c3cb2"
+let g:base16_gui03 = "6c3cb2"
+let s:gui04        = "7e5f83"
+let g:base16_gui04 = "7e5f83"
+let s:gui05        = "eed5d9"
+let g:base16_gui05 = "eed5d9"
+let s:gui06        = "d9c2c6"
+let g:base16_gui06 = "d9c2c6"
+let s:gui07        = "e4ccd0"
+let g:base16_gui07 = "e4ccd0"
+let s:gui08        = "877bb6"
+let g:base16_gui08 = "877bb6"
+let s:gui09        = "de5b44"
+let g:base16_gui09 = "de5b44"
+let s:gui0A        = "a84a73"
+let g:base16_gui0A = "a84a73"
+let s:gui0B        = "c965bf"
+let g:base16_gui0B = "c965bf"
+let s:gui0C        = "9c5fce"
+let g:base16_gui0C = "9c5fce"
+let s:gui0D        = "6a9eb5"
+let g:base16_gui0D = "6a9eb5"
+let s:gui0E        = "78a38f"
+let g:base16_gui0E = "78a38f"
+let s:gui0F        = "a3a079"
+let g:base16_gui0F = "a3a079"
+
+" Terminal color definitions
+let s:cterm00        = "00"
+let g:base16_cterm00 = "00"
+let s:cterm03        = "08"
+let g:base16_cterm03 = "08"
+let s:cterm05        = "07"
+let g:base16_cterm05 = "07"
+let s:cterm07        = "15"
+let g:base16_cterm07 = "15"
+let s:cterm08        = "01"
+let g:base16_cterm08 = "01"
+let s:cterm0A        = "03"
+let g:base16_cterm0A = "03"
+let s:cterm0B        = "02"
+let g:base16_cterm0B = "02"
+let s:cterm0C        = "06"
+let g:base16_cterm0C = "06"
+let s:cterm0D        = "04"
+let g:base16_cterm0D = "04"
+let s:cterm0E        = "05"
+let g:base16_cterm0E = "05"
+if exists("base16colorspace") && base16colorspace == "256"
+  let s:cterm01        = "18"
+  let g:base16_cterm01 = "18"
+  let s:cterm02        = "19"
+  let g:base16_cterm02 = "19"
+  let s:cterm04        = "20"
+  let g:base16_cterm04 = "20"
+  let s:cterm06        = "21"
+  let g:base16_cterm06 = "21"
+  let s:cterm09        = "16"
+  let g:base16_cterm09 = "16"
+  let s:cterm0F        = "17"
+  let g:base16_cterm0F = "17"
+else
+  let s:cterm01        = "10"
+  let g:base16_cterm01 = "10"
+  let s:cterm02        = "11"
+  let g:base16_cterm02 = "11"
+  let s:cterm04        = "12"
+  let g:base16_cterm04 = "12"
+  let s:cterm06        = "13"
+  let g:base16_cterm06 = "13"
+  let s:cterm09        = "09"
+  let g:base16_cterm09 = "09"
+  let s:cterm0F        = "14"
+  let g:base16_cterm0F = "14"
+endif
+
+" Neovim terminal colours
+if has("nvim")
+  let g:terminal_color_0 =  "#241b26"
+  let g:terminal_color_1 =  "#877bb6"
+  let g:terminal_color_2 =  "#c965bf"
+  let g:terminal_color_3 =  "#a84a73"
+  let g:terminal_color_4 =  "#6a9eb5"
+  let g:terminal_color_5 =  "#78a38f"
+  let g:terminal_color_6 =  "#9c5fce"
+  let g:terminal_color_7 =  "#eed5d9"
+  let g:terminal_color_8 =  "#6c3cb2"
+  let g:terminal_color_9 =  "#877bb6"
+  let g:terminal_color_10 = "#c965bf"
+  let g:terminal_color_11 = "#a84a73"
+  let g:terminal_color_12 = "#6a9eb5"
+  let g:terminal_color_13 = "#78a38f"
+  let g:terminal_color_14 = "#9c5fce"
+  let g:terminal_color_15 = "#e4ccd0"
+  let g:terminal_color_background = g:terminal_color_0
+  let g:terminal_color_foreground = g:terminal_color_5
+  if &background == "light"
+    let g:terminal_color_background = g:terminal_color_7
+    let g:terminal_color_foreground = g:terminal_color_2
+  endif
+elseif has("terminal")
+  let g:terminal_ansi_colors = [
+        \ "#241b26",
+        \ "#877bb6",
+        \ "#c965bf",
+        \ "#a84a73",
+        \ "#6a9eb5",
+        \ "#78a38f",
+        \ "#9c5fce",
+        \ "#eed5d9",
+        \ "#6c3cb2",
+        \ "#877bb6",
+        \ "#c965bf",
+        \ "#a84a73",
+        \ "#6a9eb5",
+        \ "#78a38f",
+        \ "#9c5fce",
+        \ "#e4ccd0",
+        \ ]
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-uwunicorn"
+
+" Highlighting function
+" Optional variables are attributes and guisp
+function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
+  let l:attr = get(a:, 1, "")
+  let l:guisp = get(a:, 2, "")
+
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
+  if a:guifg != ""
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
+  endif
+  if a:guibg != ""
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . a:ctermfg
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . a:ctermbg
+  endif
+  if l:attr != ""
+    exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
+  endif
+  if l:guisp != ""
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
+  endif
+endfunction
+
+
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+  call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
+endfun
+
+" Vim editor colors
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("Bold",          "", "", "", "", "bold", "")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "", "")
+call <sid>hi("Substitute",    s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
+call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
+
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
+call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
+
+" C#
+call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType",                  s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
+
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
+
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
+call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
+call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
+
+" Git
+call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitUntracked",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitDiscarded",      s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitSelected",       s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("gitcommitHeader",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("gitcommitSelectedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitUnmergedType",   s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitDiscardedType",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("gitcommitBranch",         s:gui09, "", s:cterm09, "", "bold", "")
+call <sid>hi("gitcommitUntrackedFile",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
+call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
+
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
+
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
+" pangloss/vim-javascript
+call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsThis",              s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("jsClassDefinition",   s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsFunction",          s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsFuncName",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsFuncCall",          s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassFuncName",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("jsClassMethodType",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("jsRegexpString",      s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("jsGlobalObjects",     s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
+
+" Mail
+call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4",  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
+
+" PHP
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
+
+" Python
+call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
+
+" Startify
+call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
+call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifyHeader",   s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("StartifyNumber",   s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("StartifyPath",     s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySection",  s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
+
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
+
+" Remove functions
+delf <sid>hi
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-vice.vim b/colors/base16-vice.vim
index 049ce66..95ae62c 100644
--- a/colors/base16-vice.vim
+++ b/colors/base16-vice.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "1F2023"
-let g:base16_gui00 = "1F2023"
-let s:gui01        = "23262C"
-let g:base16_gui01 = "23262C"
-let s:gui02        = "313040"
-let g:base16_gui02 = "313040"
-let s:gui03        = "3A3F49"
-let g:base16_gui03 = "3A3F49"
-let s:gui04        = "525d73"
-let g:base16_gui04 = "525d73"
+let s:gui00        = "17191e"
+let g:base16_gui00 = "17191e"
+let s:gui01        = "22262d"
+let g:base16_gui01 = "22262d"
+let s:gui02        = "3c3f4c"
+let g:base16_gui02 = "3c3f4c"
+let s:gui03        = "383a47"
+let g:base16_gui03 = "383a47"
+let s:gui04        = "555e70"
+let g:base16_gui04 = "555e70"
 let s:gui05        = "8b9cbe"
 let g:base16_gui05 = "8b9cbe"
-let s:gui06        = "B2BFD9"
-let g:base16_gui06 = "B2BFD9"
-let s:gui07        = "e9efff"
-let g:base16_gui07 = "e9efff"
-let s:gui08        = "ff9cff"
-let g:base16_gui08 = "ff9cff"
-let s:gui09        = "796af5"
-let g:base16_gui09 = "796af5"
-let s:gui0A        = "f0ee6e"
-let g:base16_gui0A = "f0ee6e"
-let s:gui0B        = "6c71c4"
-let g:base16_gui0B = "6c71c4"
-let s:gui0C        = "00eaff"
-let g:base16_gui0C = "00eaff"
-let s:gui0D        = "00caff"
-let g:base16_gui0D = "00caff"
-let s:gui0E        = "61aeee"
-let g:base16_gui0E = "61aeee"
-let s:gui0F        = "fc29a8"
-let g:base16_gui0F = "fc29a8"
+let s:gui06        = "b2bfd9"
+let g:base16_gui06 = "b2bfd9"
+let s:gui07        = "f4f4f7"
+let g:base16_gui07 = "f4f4f7"
+let s:gui08        = "ff29a8"
+let g:base16_gui08 = "ff29a8"
+let s:gui09        = "85ffe0"
+let g:base16_gui09 = "85ffe0"
+let s:gui0A        = "f0ffaa"
+let g:base16_gui0A = "f0ffaa"
+let s:gui0B        = "0badff"
+let g:base16_gui0B = "0badff"
+let s:gui0C        = "8265ff"
+let g:base16_gui0C = "8265ff"
+let s:gui0D        = "00eaff"
+let g:base16_gui0D = "00eaff"
+let s:gui0E        = "00f6d9"
+let g:base16_gui0E = "00f6d9"
+let s:gui0F        = "ff3d81"
+let g:base16_gui0F = "ff3d81"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#1F2023"
-  let g:terminal_color_1 =  "#ff9cff"
-  let g:terminal_color_2 =  "#6c71c4"
-  let g:terminal_color_3 =  "#f0ee6e"
-  let g:terminal_color_4 =  "#00caff"
-  let g:terminal_color_5 =  "#61aeee"
-  let g:terminal_color_6 =  "#00eaff"
+  let g:terminal_color_0 =  "#17191e"
+  let g:terminal_color_1 =  "#ff29a8"
+  let g:terminal_color_2 =  "#0badff"
+  let g:terminal_color_3 =  "#f0ffaa"
+  let g:terminal_color_4 =  "#00eaff"
+  let g:terminal_color_5 =  "#00f6d9"
+  let g:terminal_color_6 =  "#8265ff"
   let g:terminal_color_7 =  "#8b9cbe"
-  let g:terminal_color_8 =  "#3A3F49"
-  let g:terminal_color_9 =  "#ff9cff"
-  let g:terminal_color_10 = "#6c71c4"
-  let g:terminal_color_11 = "#f0ee6e"
-  let g:terminal_color_12 = "#00caff"
-  let g:terminal_color_13 = "#61aeee"
-  let g:terminal_color_14 = "#00eaff"
-  let g:terminal_color_15 = "#e9efff"
+  let g:terminal_color_8 =  "#383a47"
+  let g:terminal_color_9 =  "#ff29a8"
+  let g:terminal_color_10 = "#0badff"
+  let g:terminal_color_11 = "#f0ffaa"
+  let g:terminal_color_12 = "#00eaff"
+  let g:terminal_color_13 = "#00f6d9"
+  let g:terminal_color_14 = "#8265ff"
+  let g:terminal_color_15 = "#f4f4f7"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#1F2023",
-        \ "#ff9cff",
-        \ "#6c71c4",
-        \ "#f0ee6e",
-        \ "#00caff",
-        \ "#61aeee",
+        \ "#17191e",
+        \ "#ff29a8",
+        \ "#0badff",
+        \ "#f0ffaa",
         \ "#00eaff",
+        \ "#00f6d9",
+        \ "#8265ff",
         \ "#8b9cbe",
-        \ "#3A3F49",
-        \ "#ff9cff",
-        \ "#6c71c4",
-        \ "#f0ee6e",
-        \ "#00caff",
-        \ "#61aeee",
+        \ "#383a47",
+        \ "#ff29a8",
+        \ "#0badff",
+        \ "#f0ffaa",
         \ "#00eaff",
-        \ "#e9efff",
+        \ "#00f6d9",
+        \ "#8265ff",
+        \ "#f4f4f7",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
diff --git a/colors/base16-vulcan.vim b/colors/base16-vulcan.vim
index 59b2240..ea5f1cc 100644
--- a/colors/base16-vulcan.vim
+++ b/colors/base16-vulcan.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-windows-10-light.vim b/colors/base16-windows-10-light.vim
index 2c2cb27..d032515 100644
--- a/colors/base16-windows-10-light.vim
+++ b/colors/base16-windows-10-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-windows-10.vim b/colors/base16-windows-10.vim
index beb7f0c..011ad25 100644
--- a/colors/base16-windows-10.vim
+++ b/colors/base16-windows-10.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-windows-95-light.vim b/colors/base16-windows-95-light.vim
index 3f873fe..2b38070 100644
--- a/colors/base16-windows-95-light.vim
+++ b/colors/base16-windows-95-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-windows-95.vim b/colors/base16-windows-95.vim
index 18d4497..862eed1 100644
--- a/colors/base16-windows-95.vim
+++ b/colors/base16-windows-95.vim
@@ -17,8 +17,8 @@ endif
 " GUI color definitions
 let s:gui00        = "000000"
 let g:base16_gui00 = "000000"
-let s:gui01        = "1C1C1C"
-let g:base16_gui01 = "1C1C1C"
+let s:gui01        = "1c1c1c"
+let g:base16_gui01 = "1c1c1c"
 let s:gui02        = "383838"
 let g:base16_gui02 = "383838"
 let s:gui03        = "545454"
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-windows-highcontrast-light.vim b/colors/base16-windows-highcontrast-light.vim
index b7b4483..fd7df6b 100644
--- a/colors/base16-windows-highcontrast-light.vim
+++ b/colors/base16-windows-highcontrast-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-windows-highcontrast.vim b/colors/base16-windows-highcontrast.vim
index 9374d61..7756049 100644
--- a/colors/base16-windows-highcontrast.vim
+++ b/colors/base16-windows-highcontrast.vim
@@ -17,8 +17,8 @@ endif
 " GUI color definitions
 let s:gui00        = "000000"
 let g:base16_gui00 = "000000"
-let s:gui01        = "1C1C1C"
-let g:base16_gui01 = "1C1C1C"
+let s:gui01        = "1c1c1c"
+let g:base16_gui01 = "1c1c1c"
 let s:gui02        = "383838"
 let g:base16_gui02 = "383838"
 let s:gui03        = "545454"
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-windows-nt-light.vim b/colors/base16-windows-nt-light.vim
index 81153a5..b64d970 100644
--- a/colors/base16-windows-nt-light.vim
+++ b/colors/base16-windows-nt-light.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-windows-nt.vim b/colors/base16-windows-nt.vim
index a555793..93d26c7 100644
--- a/colors/base16-windows-nt.vim
+++ b/colors/base16-windows-nt.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,29 +561,65 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
-call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
-
 " Treesitter
-call <sid>hi("TSNote",              s:gui00, s:gui0D, s:cterm00, s:cterm0D, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui0A, s:cterm00, s:cterm0A, "", "")
-call <sid>hi("TSWarning",           s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("TSConstructor",       s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSField",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeyword",           s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSKeywordFunction",   s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSLabel",             s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSOperator",          s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSParameter",         s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSPunctDelimiter",    s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSPunctBracket",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSPunctSpecial",      s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("TSStringRegex",       s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSStringEscape",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSVariable",          s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSVariableBuiltin",   s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("TSTextReference",     s:gui0C, "", s:cterm0C, "", "", "")
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
+call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Remove functions
 delf <sid>hi
diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim
index 4d542dd..37f0833 100644
--- a/colors/base16-woodland.vim
+++ b/colors/base16-woodland.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim
index 2960746..9f0759f 100644
--- a/colors/base16-xcode-dusk.vim
+++ b/colors/base16-xcode-dusk.vim
@@ -15,38 +15,38 @@ if !has("gui_running")
 endif
 
 " GUI color definitions
-let s:gui00        = "282B35"
-let g:base16_gui00 = "282B35"
-let s:gui01        = "3D4048"
-let g:base16_gui01 = "3D4048"
-let s:gui02        = "53555D"
-let g:base16_gui02 = "53555D"
-let s:gui03        = "686A71"
-let g:base16_gui03 = "686A71"
-let s:gui04        = "7E8086"
-let g:base16_gui04 = "7E8086"
+let s:gui00        = "282b35"
+let g:base16_gui00 = "282b35"
+let s:gui01        = "3d4048"
+let g:base16_gui01 = "3d4048"
+let s:gui02        = "53555d"
+let g:base16_gui02 = "53555d"
+let s:gui03        = "686a71"
+let g:base16_gui03 = "686a71"
+let s:gui04        = "7e8086"
+let g:base16_gui04 = "7e8086"
 let s:gui05        = "939599"
 let g:base16_gui05 = "939599"
-let s:gui06        = "A9AAAE"
-let g:base16_gui06 = "A9AAAE"
-let s:gui07        = "BEBFC2"
-let g:base16_gui07 = "BEBFC2"
-let s:gui08        = "B21889"
-let g:base16_gui08 = "B21889"
-let s:gui09        = "786DC5"
-let g:base16_gui09 = "786DC5"
+let s:gui06        = "a9aaae"
+let g:base16_gui06 = "a9aaae"
+let s:gui07        = "bebfc2"
+let g:base16_gui07 = "bebfc2"
+let s:gui08        = "b21889"
+let g:base16_gui08 = "b21889"
+let s:gui09        = "786dc5"
+let g:base16_gui09 = "786dc5"
 let s:gui0A        = "438288"
 let g:base16_gui0A = "438288"
-let s:gui0B        = "DF0002"
-let g:base16_gui0B = "DF0002"
-let s:gui0C        = "00A0BE"
-let g:base16_gui0C = "00A0BE"
-let s:gui0D        = "790EAD"
-let g:base16_gui0D = "790EAD"
-let s:gui0E        = "B21889"
-let g:base16_gui0E = "B21889"
-let s:gui0F        = "C77C48"
-let g:base16_gui0F = "C77C48"
+let s:gui0B        = "df0002"
+let g:base16_gui0B = "df0002"
+let s:gui0C        = "00a0be"
+let g:base16_gui0C = "00a0be"
+let s:gui0D        = "790ead"
+let g:base16_gui0D = "790ead"
+let s:gui0E        = "b21889"
+let g:base16_gui0E = "b21889"
+let s:gui0F        = "c77c48"
+let g:base16_gui0F = "c77c48"
 
 " Terminal color definitions
 let s:cterm00        = "00"
@@ -99,22 +99,22 @@ endif
 
 " Neovim terminal colours
 if has("nvim")
-  let g:terminal_color_0 =  "#282B35"
-  let g:terminal_color_1 =  "#B21889"
-  let g:terminal_color_2 =  "#DF0002"
+  let g:terminal_color_0 =  "#282b35"
+  let g:terminal_color_1 =  "#b21889"
+  let g:terminal_color_2 =  "#df0002"
   let g:terminal_color_3 =  "#438288"
-  let g:terminal_color_4 =  "#790EAD"
-  let g:terminal_color_5 =  "#B21889"
-  let g:terminal_color_6 =  "#00A0BE"
+  let g:terminal_color_4 =  "#790ead"
+  let g:terminal_color_5 =  "#b21889"
+  let g:terminal_color_6 =  "#00a0be"
   let g:terminal_color_7 =  "#939599"
-  let g:terminal_color_8 =  "#686A71"
-  let g:terminal_color_9 =  "#B21889"
-  let g:terminal_color_10 = "#DF0002"
+  let g:terminal_color_8 =  "#686a71"
+  let g:terminal_color_9 =  "#b21889"
+  let g:terminal_color_10 = "#df0002"
   let g:terminal_color_11 = "#438288"
-  let g:terminal_color_12 = "#790EAD"
-  let g:terminal_color_13 = "#B21889"
-  let g:terminal_color_14 = "#00A0BE"
-  let g:terminal_color_15 = "#BEBFC2"
+  let g:terminal_color_12 = "#790ead"
+  let g:terminal_color_13 = "#b21889"
+  let g:terminal_color_14 = "#00a0be"
+  let g:terminal_color_15 = "#bebfc2"
   let g:terminal_color_background = g:terminal_color_0
   let g:terminal_color_foreground = g:terminal_color_5
   if &background == "light"
@@ -123,22 +123,22 @@ if has("nvim")
   endif
 elseif has("terminal")
   let g:terminal_ansi_colors = [
-        \ "#282B35",
-        \ "#B21889",
-        \ "#DF0002",
+        \ "#282b35",
+        \ "#b21889",
+        \ "#df0002",
         \ "#438288",
-        \ "#790EAD",
-        \ "#B21889",
-        \ "#00A0BE",
+        \ "#790ead",
+        \ "#b21889",
+        \ "#00a0be",
         \ "#939599",
-        \ "#686A71",
-        \ "#B21889",
-        \ "#DF0002",
+        \ "#686a71",
+        \ "#b21889",
+        \ "#df0002",
         \ "#438288",
-        \ "#790EAD",
-        \ "#B21889",
-        \ "#00A0BE",
-        \ "#BEBFC2",
+        \ "#790ead",
+        \ "#b21889",
+        \ "#00a0be",
+        \ "#bebfc2",
         \ ]
 endif
 
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim
index fee9a1e..8e04e8c 100644
--- a/colors/base16-zenburn.vim
+++ b/colors/base16-zenburn.vim
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter
diff --git a/screenshots/base16-vim-screenshot-classic-dark.png b/screenshots/base16-vim-screenshot-classic-dark.png
new file mode 100644
index 0000000..d34e29d
--- /dev/null
+++ b/screenshots/base16-vim-screenshot-classic-dark.png
diff --git a/screenshots/base16-vim-screenshot-horizon-dark.png b/screenshots/base16-vim-screenshot-horizon-dark.png
new file mode 100644
index 0000000..7cc9a42
--- /dev/null
+++ b/screenshots/base16-vim-screenshot-horizon-dark.png
diff --git a/screenshots/base16-vim-screenshot-onedark.png b/screenshots/base16-vim-screenshot-onedark.png
new file mode 100644
index 0000000..a5794e1
--- /dev/null
+++ b/screenshots/base16-vim-screenshot-onedark.png
diff --git a/with-base16colorspace-256-without-base16-shell.png b/screenshots/with-base16colorspace-256-without-base16-shell.png
index 055fbd4..055fbd4 100644
--- a/with-base16colorspace-256-without-base16-shell.png
+++ b/screenshots/with-base16colorspace-256-without-base16-shell.png
diff --git a/without-base16colorspace-256-with-256-terminal-theme.png b/screenshots/without-base16colorspace-256-with-256-terminal-theme.png
index bc866ce..bc866ce 100644
--- a/without-base16colorspace-256-with-256-terminal-theme.png
+++ b/screenshots/without-base16colorspace-256-with-256-terminal-theme.png
diff --git a/templates/default.mustache b/templates/default.mustache
index d5c7476..906457b 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -153,11 +153,22 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
   let l:attr = get(a:, 1, "")
   let l:guisp = get(a:, 2, "")
 
+  " See :help highlight-guifg
+  let l:gui_special_names = ["NONE", "bg", "background", "fg", "foreground"]
+
   if a:guifg != ""
-    exec "hi " . a:group . " guifg=#" . a:guifg
+    if index(l:gui_special_names, a:guifg) >= 0
+      exec "hi " . a:group . " guifg=" . a:guifg
+    else
+      exec "hi " . a:group . " guifg=#" . a:guifg
+    endif
   endif
   if a:guibg != ""
-    exec "hi " . a:group . " guibg=#" . a:guibg
+    if index(l:gui_special_names, a:guibg) >= 0
+      exec "hi " . a:group . " guibg=" . a:guibg
+    else
+      exec "hi " . a:group . " guibg=#" . a:guibg
+    endif
   endif
   if a:ctermfg != ""
     exec "hi " . a:group . " ctermfg=" . a:ctermfg
@@ -169,7 +180,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...)
     exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
   endif
   if l:guisp != ""
-    exec "hi " . a:group . " guisp=#" . l:guisp
+    if index(l:gui_special_names, l:guisp) >= 0
+      exec "hi " . a:group . " guisp=" . l:guisp
+    else
+      exec "hi " . a:group . " guisp=#" . l:guisp
+    endif
   endif
 endfunction
 
@@ -186,10 +201,10 @@ call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Error",         s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
 call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("FoldColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("Folded",        s:gui02, s:gui00, s:cterm02, s:cterm00, "", "")
 call <sid>hi("IncSearch",     s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic",        "", "", "", "", "none", "")
+call <sid>hi("Italic",        "", "", "", "", "italic", "")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("MatchParen",    "", s:gui03, "", s:cterm03,  "", "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -203,35 +218,38 @@ call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "", "")
 call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu",      s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("WildMenu",      s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
 call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none", "")
 call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "inverse", "")
 call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("Whitespace",    s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("LineNr",        s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("SignColumn",    s:gui03, s:gui00, s:cterm03, s:cterm00, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
 call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("VertSplit",     s:gui01, s:gui00, s:cterm01, s:cterm00, "none", "")
 call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none", "")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
+call <sid>hi("CursorLineNr",  s:gui04, s:gui01, s:cterm04, s:cterm01, "bold", "")
 call <sid>hi("QuickFixLine",  "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu",         s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel",      s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
+call <sid>hi("PMenu",         s:gui06, s:gui01, s:cterm06, s:cterm01, "none", "")
+call <sid>hi("PMenuSel",      s:gui06, s:gui02, s:cterm06, s:cterm02, "", "")
+call <sid>hi("PMenuSbar",     "", s:gui03, "", s:cterm03, "", "")
+call <sid>hi("PMenuThumb",    "", s:gui04, "", s:cterm04, "", "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
 
-" Standard syntax highlighting
+" Standard syntax
 call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Delimiter",    s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none", "")
@@ -241,9 +259,9 @@ call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none", "")
 call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat",       s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("SpecialChar",  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "", "")
@@ -253,11 +271,44 @@ call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
 call <sid>hi("Type",         s:gui0A, "", s:cterm0A, "", "none", "")
 call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "", "")
 
-" C highlighting
+" Standard highlights to be used by plugins
+call <sid>hi("Deprecated",   "", "", "", "", "strikethrough", "")
+call <sid>hi("SearchMatch",  s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("GitAddSign",           s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("GitChangeSign",        s:gui04, "", s:cterm04, "", "", "")
+call <sid>hi("GitDeleteSign",        s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("GitChangeDeleteSign",  s:gui04, "", s:cterm04, "", "", "")
+
+call <sid>hi("ErrorSign",    s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningSign",  s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("InfoSign",     s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("HintSign",     s:gui0C, "", s:cterm0C, "", "", "")
+
+call <sid>hi("ErrorFloat",   s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("WarningFloat", s:gui09, s:gui01, s:cterm09, s:cterm01, "", "")
+call <sid>hi("InfoFloat",    s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("HintFloat",    s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+
+call <sid>hi("ErrorHighlight",   "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+
+call <sid>hi("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+
+call <sid>hi("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
+call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
+call <sid>hi("ReferenceWrite",  s:gui01, s:gui08, s:cterm01, s:cterm08, "", "")
+
+" C
 call <sid>hi("cOperator",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("cPreCondit",  s:gui0E, "", s:cterm0E, "", "", "")
 
-" C# highlighting
+" C#
 call <sid>hi("csClass",                 s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csAttribute",             s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("csModifier",              s:gui0E, "", s:cterm0E, "", "", "")
@@ -266,15 +317,126 @@ call <sid>hi("csUnspecifiedStatement",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
-" CSS highlighting
+" Clap
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
+
+" Coc
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
+
+call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
+call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
+call <sid>hi("CocHighlightWrite",  s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("CocListMode",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "bold", "")
+call <sid>hi("CocListPath",        s:gui01, s:gui0B,  s:cterm01, s:cterm0B, "", "")
+call <sid>hi("CocSessionsName",    s:gui05, "", s:cterm05, "", "", "")
+
+" CSS
 call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "", "")
 
-" Diff highlighting
+" CMP
+hi! link CmpItemAbbrDeprecated  Deprecated 
+hi! link CmpItemAbbrMatch       SearchMatch
+hi! link CmpItemAbbrMatchFuzzy  SearchMatch
+hi! link CmpItemKindText TSText
+hi! link CmpItemKindMethod TSMethod
+hi! link CmpItemKindFunction TSFunction
+hi! link CmpItemKindConstructor TSConstructor
+hi! link CmpItemKindField TSField
+hi! link CmpItemKindVariable TSVariable
+" hi! link CmpItemKindClass TS
+hi! link CmpItemKindInterface TSText
+" hi! link CmpItemKindModule TS
+hi! link CmpItemKindProperty TSProperty
+hi! link CmpItemKindUnit TSKeyword
+" hi! link CmpItemKindValue TS
+" hi! link CmpItemKindEnum TS
+hi! link CmpItemKindKeyword TSKeyword
+" hi! link CmpItemKindSnippet TS
+" hi! link CmpItemKindColor TS
+" hi! link CmpItemKindFile TS
+" hi! link CmpItemKindReference TS
+" hi! link CmpItemKindFolder TS
+" hi! link CmpItemKindEnumMember TS
+hi! link CmpItemKindConstant TSConstant
+" hi! link CmpItemKindStruct TS
+" hi! link CmpItemKindEvent TS
+hi! link CmpItemKindOperator TSOperator
+hi! link CmpItemKindTypeParameter TSType
+
+" Diff
 call <sid>hi("DiffAdd",      s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
-call <sid>hi("DiffChange",   s:gui03, s:gui01,  s:cterm03, s:cterm01, "", "")
-call <sid>hi("DiffDelete",   s:gui08, s:gui01,  s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffChange",   s:gui05, s:gui01,  s:cterm05, s:cterm01, "", "")
+call <sid>hi("DiffDelete",   s:gui02, s:gui00,  s:cterm02, s:cterm00, "", "")
 call <sid>hi("DiffText",     s:gui0D, s:gui01,  s:cterm0D, s:cterm01, "", "")
 call <sid>hi("DiffAdded",    s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffFile",     s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
@@ -282,7 +444,7 @@ call <sid>hi("DiffNewFile",  s:gui0B, s:gui00,  s:cterm0B, s:cterm00, "", "")
 call <sid>hi("DiffLine",     s:gui0D, s:gui00,  s:cterm0D, s:cterm00, "", "")
 call <sid>hi("DiffRemoved",  s:gui08, s:gui00,  s:cterm08, s:cterm00, "", "")
 
-" Git highlighting
+" Git
 call <sid>hi("gitcommitOverflow",       s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("gitcommitSummary",        s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("gitcommitComment",        s:gui03, "", s:cterm03, "", "", "")
@@ -299,23 +461,23 @@ call <sid>hi("gitcommitUnmergedFile",   s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
-call <sid>hi("GitGutterChangeDelete",  s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+" GitGutter
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
-" HTML highlighting
-call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "", "")
+" HTML
+call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
+call <sid>hi("htmlItalic",  s:gui05, "", s:cterm0E, "", "italic", "")
 call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "", "")
 
-" JavaScript highlighting
+" JavaScript
 call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "", "")
-" pangloss/vim-javascript highlighting
+" pangloss/vim-javascript
 call <sid>hi("jsOperator",          s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("jsStatement",         s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("jsReturn",            s:gui0E, "", s:cterm0E, "", "", "")
@@ -332,7 +494,7 @@ call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsExceptions",        s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("jsBuiltins",          s:gui0A, "", s:cterm0A, "", "", "")
 
-" Mail highlighting
+" Mail
 call <sid>hi("mailQuoted1",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailQuoted2",  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("mailQuoted3",  s:gui0E, "", s:cterm0E, "", "", "")
@@ -342,29 +504,32 @@ call <sid>hi("mailQuoted6",  s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("mailURL",      s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("mailEmail",    s:gui0D, "", s:cterm0D, "", "", "")
 
-" Markdown highlighting
+" Markdown
 call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownError",             s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
 call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" NERDTree highlighting
+" Matchup
+call <sid>hi("MatchWord",  s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "underline", "")
+
+" NERDTree
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "", "")
 
-" PHP highlighting
+" PHP
 call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "", "")
 call <sid>hi("phpMethodsVar",      s:gui0C, "", s:cterm0C, "", "", "")
 
-" Python highlighting
+" Python
 call <sid>hi("pythonOperator",  s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonRepeat",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonInclude",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "")
 
-" Ruby highlighting
+" Ruby
 call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "", "")
 call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "", "")
 call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "", "")
@@ -372,25 +537,19 @@ call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "", "")
 call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "", "")
 
-" SASS highlighting
+" SASS
 call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "", "")
 call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "", "")
 call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
-" Signify highlighting
-call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+" Signify
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
-" Spelling highlighting
-call <sid>hi("SpellBad",     "", "", "", "", "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", "", "", "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", "", "", "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", "", "", "undercurl", s:gui0E)
-
-" Startify highlighting
+" Startify
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifyFile",     s:gui07, "", s:cterm07, "", "", "")
 call <sid>hi("StartifyFooter",   s:gui03, "", s:cterm03, "", "", "")
@@ -402,7 +561,64 @@ call <sid>hi("StartifySelect",   s:gui0C, "", s:cterm0C, "", "", "")
 call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
-" Java highlighting
+" Treesitter
+hi! link TSVariable Identifier
+
+" Treesitter-refactor
+if has("nvim")
+  call <sid>hi("TSDefinition",       "", s:gui03, "", s:cterm03, "", "")
+  call <sid>hi("TSDefinitionUsage",  "", s:gui02, "", s:cterm02, "none", "")
+endif
+
+" LSP
+if has("nvim")
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
+endif
+
+" Java
 call <sid>hi("javaOperator",     s:gui0D, "", s:cterm0D, "", "", "")
 
 " Treesitter