Wrap Neovim-specific groups in has("nvim")

163 files changed, 1304 insertions, 978 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 21b378f..ef26387 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index aa04fd0..fda041e 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 065f6d2..81b5043 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim
index 7f86a54..12b6e02 100644
--- a/colors/base16-atelier-cave-light.vim
+++ b/colors/base16-atelier-cave-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim
index e547897..6e8d894 100644
--- a/colors/base16-atelier-cave.vim
+++ b/colors/base16-atelier-cave.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim
index 4369496..1cd0207 100644
--- a/colors/base16-atelier-dune-light.vim
+++ b/colors/base16-atelier-dune-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim
index 2637e40..b7eeea9 100644
--- a/colors/base16-atelier-dune.vim
+++ b/colors/base16-atelier-dune.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim
index 391fb3b..a286c6e 100644
--- a/colors/base16-atelier-estuary-light.vim
+++ b/colors/base16-atelier-estuary-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim
index 43ad310..496c90a 100644
--- a/colors/base16-atelier-estuary.vim
+++ b/colors/base16-atelier-estuary.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim
index c254138..74fe168 100644
--- a/colors/base16-atelier-forest-light.vim
+++ b/colors/base16-atelier-forest-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim
index 534094c..c389931 100644
--- a/colors/base16-atelier-forest.vim
+++ b/colors/base16-atelier-forest.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim
index 82a8160..87aabfe 100644
--- a/colors/base16-atelier-heath-light.vim
+++ b/colors/base16-atelier-heath-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim
index aa773a8..e9cee2d 100644
--- a/colors/base16-atelier-heath.vim
+++ b/colors/base16-atelier-heath.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim
index 20022ba..a1bd3ea 100644
--- a/colors/base16-atelier-lakeside-light.vim
+++ b/colors/base16-atelier-lakeside-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim
index 799fc34..75f9423 100644
--- a/colors/base16-atelier-lakeside.vim
+++ b/colors/base16-atelier-lakeside.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim
index 2c54c76..bcafa11 100644
--- a/colors/base16-atelier-plateau-light.vim
+++ b/colors/base16-atelier-plateau-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim
index 32fc392..23536d3 100644
--- a/colors/base16-atelier-plateau.vim
+++ b/colors/base16-atelier-plateau.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim
index 0a07f5d..a5b6e13 100644
--- a/colors/base16-atelier-savanna-light.vim
+++ b/colors/base16-atelier-savanna-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim
index 9824050..ee05b6f 100644
--- a/colors/base16-atelier-savanna.vim
+++ b/colors/base16-atelier-savanna.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim
index 0eca684..40e3535 100644
--- a/colors/base16-atelier-seaside-light.vim
+++ b/colors/base16-atelier-seaside-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim
index d177144..bb54fff 100644
--- a/colors/base16-atelier-seaside.vim
+++ b/colors/base16-atelier-seaside.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim
index 8286da2..7bb65bb 100644
--- a/colors/base16-atelier-sulphurpool-light.vim
+++ b/colors/base16-atelier-sulphurpool-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim
index d108c35..c51d7e3 100644
--- a/colors/base16-atelier-sulphurpool.vim
+++ b/colors/base16-atelier-sulphurpool.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-atlas.vim b/colors/base16-atlas.vim
index 88e3764..bace4d5 100644
--- a/colors/base16-atlas.vim
+++ b/colors/base16-atlas.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index 59a70eb..f109e92 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-bathory.vim b/colors/base16-black-metal-bathory.vim
index 4885eb7..b8b96d3 100644
--- a/colors/base16-black-metal-bathory.vim
+++ b/colors/base16-black-metal-bathory.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-burzum.vim b/colors/base16-black-metal-burzum.vim
index b2aba9f..8bfb609 100644
--- a/colors/base16-black-metal-burzum.vim
+++ b/colors/base16-black-metal-burzum.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-dark-funeral.vim b/colors/base16-black-metal-dark-funeral.vim
index cbb92a5..577fd37 100644
--- a/colors/base16-black-metal-dark-funeral.vim
+++ b/colors/base16-black-metal-dark-funeral.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-gorgoroth.vim b/colors/base16-black-metal-gorgoroth.vim
index 9b39279..99806dc 100644
--- a/colors/base16-black-metal-gorgoroth.vim
+++ b/colors/base16-black-metal-gorgoroth.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-immortal.vim b/colors/base16-black-metal-immortal.vim
index 81b9f45..1516fc1 100644
--- a/colors/base16-black-metal-immortal.vim
+++ b/colors/base16-black-metal-immortal.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-khold.vim b/colors/base16-black-metal-khold.vim
index 8d8cf68..3d749eb 100644
--- a/colors/base16-black-metal-khold.vim
+++ b/colors/base16-black-metal-khold.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-marduk.vim b/colors/base16-black-metal-marduk.vim
index 508dd84..9c385f1 100644
--- a/colors/base16-black-metal-marduk.vim
+++ b/colors/base16-black-metal-marduk.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-mayhem.vim b/colors/base16-black-metal-mayhem.vim
index 2cf5f58..f7d92d1 100644
--- a/colors/base16-black-metal-mayhem.vim
+++ b/colors/base16-black-metal-mayhem.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-nile.vim b/colors/base16-black-metal-nile.vim
index e77de82..f93a67b 100644
--- a/colors/base16-black-metal-nile.vim
+++ b/colors/base16-black-metal-nile.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal-venom.vim b/colors/base16-black-metal-venom.vim
index 394b140..8e466e1 100644
--- a/colors/base16-black-metal-venom.vim
+++ b/colors/base16-black-metal-venom.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-black-metal.vim b/colors/base16-black-metal.vim
index 99c04ee..8ced04a 100644
--- a/colors/base16-black-metal.vim
+++ b/colors/base16-black-metal.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index c5e201a..9a7582d 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index e325f30..81ce64f 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-brogrammer.vim b/colors/base16-brogrammer.vim
index 78aef7a..9a50e47 100644
--- a/colors/base16-brogrammer.vim
+++ b/colors/base16-brogrammer.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim
index 087a7bb..ccbe893 100644
--- a/colors/base16-brushtrees-dark.vim
+++ b/colors/base16-brushtrees-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim
index 9f96c72..7dcc690 100644
--- a/colors/base16-brushtrees.vim
+++ b/colors/base16-brushtrees.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index a0b63a4..caa856d 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim
index d7d1e35..7bd05c7 100644
--- a/colors/base16-circus.vim
+++ b/colors/base16-circus.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim
index 62d8990..22d1237 100644
--- a/colors/base16-classic-dark.vim
+++ b/colors/base16-classic-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim
index afd4b78..aba9c86 100644
--- a/colors/base16-classic-light.vim
+++ b/colors/base16-classic-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index e3b2368..67821be 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim
index 90960cf..c8cb367 100644
--- a/colors/base16-cupcake.vim
+++ b/colors/base16-cupcake.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim
index 1d1be8d..95dd4c4 100644
--- a/colors/base16-cupertino.vim
+++ b/colors/base16-cupertino.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-darkmoss.vim b/colors/base16-darkmoss.vim
index 3cc7927..d07438b 100644
--- a/colors/base16-darkmoss.vim
+++ b/colors/base16-darkmoss.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim
index 513ba33..1a65726 100644
--- a/colors/base16-darktooth.vim
+++ b/colors/base16-darktooth.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-darkviolet.vim b/colors/base16-darkviolet.vim
index df361bc..d99bca2 100644
--- a/colors/base16-darkviolet.vim
+++ b/colors/base16-darkviolet.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-decaf.vim b/colors/base16-decaf.vim
index 7039791..080909d 100644
--- a/colors/base16-decaf.vim
+++ b/colors/base16-decaf.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim
index 8c5b388..2dcff3a 100644
--- a/colors/base16-default-dark.vim
+++ b/colors/base16-default-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim
index 5c79ec0..1807bf9 100644
--- a/colors/base16-default-light.vim
+++ b/colors/base16-default-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-dirtysea.vim b/colors/base16-dirtysea.vim
index 6d05c2a..ac0956d 100644
--- a/colors/base16-dirtysea.vim
+++ b/colors/base16-dirtysea.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim
index 4bc1fb5..4257747 100644
--- a/colors/base16-dracula.vim
+++ b/colors/base16-dracula.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-edge-dark.vim b/colors/base16-edge-dark.vim
index 7df5e5b..7266613 100644
--- a/colors/base16-edge-dark.vim
+++ b/colors/base16-edge-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-edge-light.vim b/colors/base16-edge-light.vim
index f964bb1..79fdda3 100644
--- a/colors/base16-edge-light.vim
+++ b/colors/base16-edge-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 546770f..cc95bb2 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 359953e..a0c163a 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-equilibrium-dark.vim b/colors/base16-equilibrium-dark.vim
index 9822cec..a79493e 100644
--- a/colors/base16-equilibrium-dark.vim
+++ b/colors/base16-equilibrium-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-equilibrium-gray-dark.vim b/colors/base16-equilibrium-gray-dark.vim
index 53f426a..4a4c8cc 100644
--- a/colors/base16-equilibrium-gray-dark.vim
+++ b/colors/base16-equilibrium-gray-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-equilibrium-gray-light.vim b/colors/base16-equilibrium-gray-light.vim
index b9b9416..36e1c8e 100644
--- a/colors/base16-equilibrium-gray-light.vim
+++ b/colors/base16-equilibrium-gray-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-equilibrium-light.vim b/colors/base16-equilibrium-light.vim
index a050af8..7c53ba9 100644
--- a/colors/base16-equilibrium-light.vim
+++ b/colors/base16-equilibrium-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-espresso.vim b/colors/base16-espresso.vim
index f78d137..244c1fe 100644
--- a/colors/base16-espresso.vim
+++ b/colors/base16-espresso.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-eva-dim.vim b/colors/base16-eva-dim.vim
index 4f0eb4c..4871f53 100644
--- a/colors/base16-eva-dim.vim
+++ b/colors/base16-eva-dim.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-eva.vim b/colors/base16-eva.vim
index 10009cc..a989052 100644
--- a/colors/base16-eva.vim
+++ b/colors/base16-eva.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index c2f62e3..761643e 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-framer.vim b/colors/base16-framer.vim
index b62694c..9e854bb 100644
--- a/colors/base16-framer.vim
+++ b/colors/base16-framer.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-fruit-soda.vim b/colors/base16-fruit-soda.vim
index 8fdeb60..e565c12 100644
--- a/colors/base16-fruit-soda.vim
+++ b/colors/base16-fruit-soda.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-gigavolt.vim b/colors/base16-gigavolt.vim
index cf662f1..d617646 100644
--- a/colors/base16-gigavolt.vim
+++ b/colors/base16-gigavolt.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-github.vim b/colors/base16-github.vim
index 1481a82..3d96a30 100644
--- a/colors/base16-github.vim
+++ b/colors/base16-github.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim
index 4af4530..dec440b 100644
--- a/colors/base16-google-dark.vim
+++ b/colors/base16-google-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim
index 91f2dc9..4d47ec6 100644
--- a/colors/base16-google-light.vim
+++ b/colors/base16-google-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim
index 049f3ae..8470b5b 100644
--- a/colors/base16-grayscale-dark.vim
+++ b/colors/base16-grayscale-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim
index 1f2c85a..ee6d1b1 100644
--- a/colors/base16-grayscale-light.vim
+++ b/colors/base16-grayscale-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index f7f8e3b..ae497fa 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim
index 0d22aaf..6d5a3d9 100644
--- a/colors/base16-gruvbox-dark-hard.vim
+++ b/colors/base16-gruvbox-dark-hard.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim
index 1fb7ca8..bee9f54 100644
--- a/colors/base16-gruvbox-dark-medium.vim
+++ b/colors/base16-gruvbox-dark-medium.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim
index 593b9ae..8ecff7f 100644
--- a/colors/base16-gruvbox-dark-pale.vim
+++ b/colors/base16-gruvbox-dark-pale.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim
index d9ca17c..7e1d18d 100644
--- a/colors/base16-gruvbox-dark-soft.vim
+++ b/colors/base16-gruvbox-dark-soft.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim
index 63a3927..8250fa3 100644
--- a/colors/base16-gruvbox-light-hard.vim
+++ b/colors/base16-gruvbox-light-hard.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim
index 222943d..c06d207 100644
--- a/colors/base16-gruvbox-light-medium.vim
+++ b/colors/base16-gruvbox-light-medium.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim
index 5e4c441..19bd2bf 100644
--- a/colors/base16-gruvbox-light-soft.vim
+++ b/colors/base16-gruvbox-light-soft.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-hardcore.vim b/colors/base16-hardcore.vim
index 9e6ac9c..ccada2f 100644
--- a/colors/base16-hardcore.vim
+++ b/colors/base16-hardcore.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim
index a8ca387..ee4367a 100644
--- a/colors/base16-harmonic-dark.vim
+++ b/colors/base16-harmonic-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim
index 7bed5b0..f6cf74f 100644
--- a/colors/base16-harmonic-light.vim
+++ b/colors/base16-harmonic-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-heetch-light.vim b/colors/base16-heetch-light.vim
index 46698c3..7f439d2 100644
--- a/colors/base16-heetch-light.vim
+++ b/colors/base16-heetch-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-heetch.vim b/colors/base16-heetch.vim
index 3fbc085..29a64af 100644
--- a/colors/base16-heetch.vim
+++ b/colors/base16-heetch.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-helios.vim b/colors/base16-helios.vim
index 8b63644..c117210 100644
--- a/colors/base16-helios.vim
+++ b/colors/base16-helios.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim
index 8e15772..0dd476e 100644
--- a/colors/base16-hopscotch.vim
+++ b/colors/base16-hopscotch.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-horizon-dark.vim b/colors/base16-horizon-dark.vim
index 2ce47d4..9f00e74 100644
--- a/colors/base16-horizon-dark.vim
+++ b/colors/base16-horizon-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-horizon-light.vim b/colors/base16-horizon-light.vim
index d94dea8..61621f1 100644
--- a/colors/base16-horizon-light.vim
+++ b/colors/base16-horizon-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-horizon-terminal-dark.vim b/colors/base16-horizon-terminal-dark.vim
index b1956c9..c55e71d 100644
--- a/colors/base16-horizon-terminal-dark.vim
+++ b/colors/base16-horizon-terminal-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-horizon-terminal-light.vim b/colors/base16-horizon-terminal-light.vim
index 2ea79d4..a0f5930 100644
--- a/colors/base16-horizon-terminal-light.vim
+++ b/colors/base16-horizon-terminal-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-humanoid-dark.vim b/colors/base16-humanoid-dark.vim
index 9bd5ac1..65cac4c 100644
--- a/colors/base16-humanoid-dark.vim
+++ b/colors/base16-humanoid-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-humanoid-light.vim b/colors/base16-humanoid-light.vim
index 589a8b1..f72c0b9 100644
--- a/colors/base16-humanoid-light.vim
+++ b/colors/base16-humanoid-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-ia-dark.vim b/colors/base16-ia-dark.vim
index 58dc06b..5df461e 100644
--- a/colors/base16-ia-dark.vim
+++ b/colors/base16-ia-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-ia-light.vim b/colors/base16-ia-light.vim
index a0c0185..1100a8f 100644
--- a/colors/base16-ia-light.vim
+++ b/colors/base16-ia-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim
index ef881f1..52306b4 100644
--- a/colors/base16-icy.vim
+++ b/colors/base16-icy.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim
index f3b3f1a..d1e8e31 100644
--- a/colors/base16-irblack.vim
+++ b/colors/base16-irblack.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index c7f06af..d6c0707 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-kimber.vim b/colors/base16-kimber.vim
index e2959d7..cf10d90 100644
--- a/colors/base16-kimber.vim
+++ b/colors/base16-kimber.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim
index 2222df2..47301cf 100644
--- a/colors/base16-macintosh.vim
+++ b/colors/base16-macintosh.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index 9aba35b..3bb6d7b 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim
index a672e87..6a38916 100644
--- a/colors/base16-materia.vim
+++ b/colors/base16-materia.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim
index b4c2334..b5cf745 100644
--- a/colors/base16-material-darker.vim
+++ b/colors/base16-material-darker.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim
index 789344e..8effd73 100644
--- a/colors/base16-material-lighter.vim
+++ b/colors/base16-material-lighter.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim
index ab23118..0b60992 100644
--- a/colors/base16-material-palenight.vim
+++ b/colors/base16-material-palenight.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-material-vivid.vim b/colors/base16-material-vivid.vim
index 8968706..4ee19b5 100644
--- a/colors/base16-material-vivid.vim
+++ b/colors/base16-material-vivid.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-material.vim b/colors/base16-material.vim
index 21bdb0e..e5c6d5f 100644
--- a/colors/base16-material.vim
+++ b/colors/base16-material.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim
index 71d3009..4b73668 100644
--- a/colors/base16-mellow-purple.vim
+++ b/colors/base16-mellow-purple.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim
index 7a4d85f..af44f43 100644
--- a/colors/base16-mexico-light.vim
+++ b/colors/base16-mexico-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 0c17e5f..79ef56c 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 77bf131..d1ecbc6 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-nebula.vim b/colors/base16-nebula.vim
index 314c891..9c08619 100644
--- a/colors/base16-nebula.vim
+++ b/colors/base16-nebula.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim
index e6690e4..6d2243f 100644
--- a/colors/base16-nord.vim
+++ b/colors/base16-nord.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-nova.vim b/colors/base16-nova.vim
index a715afd..61b4f8c 100644
--- a/colors/base16-nova.vim
+++ b/colors/base16-nova.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 90d1204..f57a993 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim
index 18d1b7a..f2cd04c 100644
--- a/colors/base16-oceanicnext.vim
+++ b/colors/base16-oceanicnext.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim
index beab6e5..323d143 100644
--- a/colors/base16-one-light.vim
+++ b/colors/base16-one-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim
index 72c20fd..2743f8e 100644
--- a/colors/base16-onedark.vim
+++ b/colors/base16-onedark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-outrun-dark.vim b/colors/base16-outrun-dark.vim
index d4c0a1a..ecc2d1b 100644
--- a/colors/base16-outrun-dark.vim
+++ b/colors/base16-outrun-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-papercolor-dark.vim b/colors/base16-papercolor-dark.vim
index d97f404..138ee07 100644
--- a/colors/base16-papercolor-dark.vim
+++ b/colors/base16-papercolor-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-papercolor-light.vim b/colors/base16-papercolor-light.vim
index 2c5a308..11bc798 100644
--- a/colors/base16-papercolor-light.vim
+++ b/colors/base16-papercolor-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index dd195dd..6dd48de 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-pasque.vim b/colors/base16-pasque.vim
index 85cb0b6..3710c80 100644
--- a/colors/base16-pasque.vim
+++ b/colors/base16-pasque.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim
index 41c0265..64d2be4 100644
--- a/colors/base16-phd.vim
+++ b/colors/base16-phd.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim
index 8145239..f3df30d 100644
--- a/colors/base16-pico.vim
+++ b/colors/base16-pico.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim
index bac1dd3..f5cabf9 100644
--- a/colors/base16-pop.vim
+++ b/colors/base16-pop.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim
index f5bee69..0cc3c32 100644
--- a/colors/base16-porple.vim
+++ b/colors/base16-porple.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 2913ad6..e0c88ad 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim
index 0ab84df..92cf204 100644
--- a/colors/base16-rebecca.vim
+++ b/colors/base16-rebecca.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-sagelight.vim b/colors/base16-sagelight.vim
index 190d156..2d5a7ff 100644
--- a/colors/base16-sagelight.vim
+++ b/colors/base16-sagelight.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-sandcastle.vim b/colors/base16-sandcastle.vim
index 3ac13d4..b3118a5 100644
--- a/colors/base16-sandcastle.vim
+++ b/colors/base16-sandcastle.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim
index 735b76d..57b81c0 100644
--- a/colors/base16-seti.vim
+++ b/colors/base16-seti.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index 47c53ca..62c85a2 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-silk-dark.vim b/colors/base16-silk-dark.vim
index 2e2bb23..7cda06a 100644
--- a/colors/base16-silk-dark.vim
+++ b/colors/base16-silk-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-silk-light.vim b/colors/base16-silk-light.vim
index 2e6a848..dda723f 100644
--- a/colors/base16-silk-light.vim
+++ b/colors/base16-silk-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-snazzy.vim b/colors/base16-snazzy.vim
index 58e7ab8..8beec3f 100644
--- a/colors/base16-snazzy.vim
+++ b/colors/base16-snazzy.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-solarflare-light.vim b/colors/base16-solarflare-light.vim
index 4676823..ade7123 100644
--- a/colors/base16-solarflare-light.vim
+++ b/colors/base16-solarflare-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim
index bc99baf..6eab012 100644
--- a/colors/base16-solarflare.vim
+++ b/colors/base16-solarflare.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim
index ba34cc1..9a31422 100644
--- a/colors/base16-solarized-dark.vim
+++ b/colors/base16-solarized-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim
index e9bc0be..3881c74 100644
--- a/colors/base16-solarized-light.vim
+++ b/colors/base16-solarized-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim
index 336630f..501e691 100644
--- a/colors/base16-spacemacs.vim
+++ b/colors/base16-spacemacs.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-summercamp.vim b/colors/base16-summercamp.vim
index 7231a26..2ad0ffa 100644
--- a/colors/base16-summercamp.vim
+++ b/colors/base16-summercamp.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim
index 09813ad..3caafcf 100644
--- a/colors/base16-summerfruit-dark.vim
+++ b/colors/base16-summerfruit-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim
index 9cd81dc..1ed4173 100644
--- a/colors/base16-summerfruit-light.vim
+++ b/colors/base16-summerfruit-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-synth-midnight-dark.vim b/colors/base16-synth-midnight-dark.vim
index df73501..4389e49 100644
--- a/colors/base16-synth-midnight-dark.vim
+++ b/colors/base16-synth-midnight-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-synth-midnight-light.vim b/colors/base16-synth-midnight-light.vim
index 8e47cba..5fec84f 100644
--- a/colors/base16-synth-midnight-light.vim
+++ b/colors/base16-synth-midnight-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-tango.vim b/colors/base16-tango.vim
index 571a596..069ca35 100644
--- a/colors/base16-tango.vim
+++ b/colors/base16-tango.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-tomorrow-night-eighties.vim b/colors/base16-tomorrow-night-eighties.vim
index b9662b3..8289b4b 100644
--- a/colors/base16-tomorrow-night-eighties.vim
+++ b/colors/base16-tomorrow-night-eighties.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim
index 7b6d259..a7943d0 100644
--- a/colors/base16-tomorrow-night.vim
+++ b/colors/base16-tomorrow-night.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 3512374..d8b4d3b 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim
index 678c2a8..c1ff1a6 100644
--- a/colors/base16-tube.vim
+++ b/colors/base16-tube.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index a0720b4..96c602f 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim
index aa8e167..81a7a9e 100644
--- a/colors/base16-unikitty-dark.vim
+++ b/colors/base16-unikitty-dark.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim
index 4fb91fa..f640697 100644
--- a/colors/base16-unikitty-light.vim
+++ b/colors/base16-unikitty-light.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-vulcan.vim b/colors/base16-vulcan.vim
index 2b3f7c5..59a82c9 100644
--- a/colors/base16-vulcan.vim
+++ b/colors/base16-vulcan.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim
index a7bb453..3f7c730 100644
--- a/colors/base16-woodland.vim
+++ b/colors/base16-woodland.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim
index 9db4bca..608fbaa 100644
--- a/colors/base16-xcode-dusk.vim
+++ b/colors/base16-xcode-dusk.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim
index 183d754..a664d31 100644
--- a/colors/base16-zenburn.vim
+++ b/colors/base16-zenburn.vim
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")
diff --git a/templates/default.mustache b/templates/default.mustache
index be5c60a..6871459 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -418,12 +418,14 @@ call <sid>hi("StartifySlash",    s:gui03, "", s:cterm03, "", "", "")
 call <sid>hi("StartifySpecial",  s:gui03, "", s:cterm03, "", "", "")
 
 " Neovim Treesitter highlighting
-call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+if has("nvim")
+  call <sid>hi("TSFunction",        s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSKeywordFunction", s:gui0E, "", s:cterm0E, "", "", "")
+  call <sid>hi("TSMethod",          s:gui0D, "", s:cterm0D, "", "", "")
+  call <sid>hi("TSProperty",        s:gui0A, "", s:cterm0A, "", "", "")
+  call <sid>hi("TSPunctBracket",    s:gui0C, "", s:cterm0C, "", "", "")
+  call <sid>hi("TSType",            s:gui08, "", s:cterm08, "", "none", "")
+endif
 
 " LSP highlighting
 if has("nvim")