aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--colors/base16-3024.vim100
-rw-r--r--colors/base16-apathy.vim100
-rw-r--r--colors/base16-ashes.vim100
-rw-r--r--colors/base16-atelierdune.vim100
-rw-r--r--colors/base16-atelierforest.vim100
-rw-r--r--colors/base16-atelierheath.vim100
-rw-r--r--colors/base16-atelierlakeside.vim100
-rw-r--r--colors/base16-atelierseaside.vim100
-rw-r--r--colors/base16-bespin.vim100
-rw-r--r--colors/base16-brewer.vim100
-rw-r--r--colors/base16-bright.vim100
-rw-r--r--colors/base16-chalk.vim100
-rw-r--r--colors/base16-codeschool.vim100
-rw-r--r--colors/base16-colors.vim100
-rw-r--r--colors/base16-default.vim100
-rw-r--r--colors/base16-eighties.vim100
-rw-r--r--colors/base16-embers.vim100
-rw-r--r--colors/base16-flat.vim100
-rw-r--r--colors/base16-google.vim100
-rw-r--r--colors/base16-grayscale.vim100
-rw-r--r--colors/base16-greenscreen.vim100
-rw-r--r--colors/base16-harmonic16.vim100
-rw-r--r--colors/base16-isotope.vim100
-rw-r--r--colors/base16-londontube.vim100
-rw-r--r--colors/base16-marrakesh.vim100
-rw-r--r--colors/base16-mocha.vim100
-rw-r--r--colors/base16-monokai.vim100
-rw-r--r--colors/base16-ocean.vim100
-rw-r--r--colors/base16-paraiso.vim100
-rw-r--r--colors/base16-railscasts.vim100
-rw-r--r--colors/base16-shapeshifter.vim100
-rw-r--r--colors/base16-solarized.vim100
-rw-r--r--colors/base16-summerfruit.vim100
-rw-r--r--colors/base16-tomorrow.vim100
-rw-r--r--colors/base16-twilight.vim100
35 files changed, 1820 insertions, 1680 deletions
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 31d7a61..f6923f0 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index 1ff9398..b0b6f37 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index c3a9950..686f2d9 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-atelierdune.vim b/colors/base16-atelierdune.vim
index c262561..b720ccf 100644
--- a/colors/base16-atelierdune.vim
+++ b/colors/base16-atelierdune.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-atelierforest.vim b/colors/base16-atelierforest.vim
index 0574867..f05686c 100644
--- a/colors/base16-atelierforest.vim
+++ b/colors/base16-atelierforest.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-atelierheath.vim b/colors/base16-atelierheath.vim
index fb3c4d8..1777043 100644
--- a/colors/base16-atelierheath.vim
+++ b/colors/base16-atelierheath.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-atelierlakeside.vim b/colors/base16-atelierlakeside.vim
index 10d5cd7..692659d 100644
--- a/colors/base16-atelierlakeside.vim
+++ b/colors/base16-atelierlakeside.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-atelierseaside.vim b/colors/base16-atelierseaside.vim
index 5aad7d5..e0ea42f 100644
--- a/colors/base16-atelierseaside.vim
+++ b/colors/base16-atelierseaside.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index a0dec1e..5a6cb45 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index f4a1803..28b5aae 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index 6431f7a..8016d01 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index e5f3cef..03e7e83 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index b0dbf2c..aabf257 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-colors.vim b/colors/base16-colors.vim
index 7addab9..3f2af41 100644
--- a/colors/base16-colors.vim
+++ b/colors/base16-colors.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-default.vim b/colors/base16-default.vim
index 0da2acc..ef996ff 100644
--- a/colors/base16-default.vim
+++ b/colors/base16-default.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index bd6bb48..80e653d 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 382e8ce..69964dc 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index cf9bc52..9132a63 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-google.vim b/colors/base16-google.vim
index 3459813..cc7f23b 100644
--- a/colors/base16-google.vim
+++ b/colors/base16-google.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-grayscale.vim b/colors/base16-grayscale.vim
index 91eecd8..0e33604 100644
--- a/colors/base16-grayscale.vim
+++ b/colors/base16-grayscale.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index 13c5d17..1ea4334 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-harmonic16.vim b/colors/base16-harmonic16.vim
index 224ee19..8fc6d22 100644
--- a/colors/base16-harmonic16.vim
+++ b/colors/base16-harmonic16.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index 2fb2b20..f1a519d 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-londontube.vim b/colors/base16-londontube.vim
index 46bcfd0..5ef9185 100644
--- a/colors/base16-londontube.vim
+++ b/colors/base16-londontube.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index 9e455a9..0668f9e 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 78b8e9b..b643f06 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 9db4c2c..f1f0b37 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index edac7b2..6632835 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index ad0c9c6..3c518d5 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 723dc0c..c315f3a 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index c6573bc..d6fb5f2 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim
index 390e830..22c181f 100644
--- a/colors/base16-solarized.vim
+++ b/colors/base16-solarized.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-summerfruit.vim b/colors/base16-summerfruit.vim
index 3fa355e..2d84295 100644
--- a/colors/base16-summerfruit.vim
+++ b/colors/base16-summerfruit.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 85f4ccd..eed938e 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index 099800d..8017213 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -204,16 +204,19 @@ call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-" Additional diff highlighting
+" Diff highlighting
call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
@@ -224,19 +227,15 @@ call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
-
-" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
" HTML highlighting
call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
@@ -244,51 +243,56 @@ call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
-" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
-
-" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
-
" JavaScript highlighting
call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
-" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
-
" Markdown highlighting
call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
-" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
" Signify highlighting
call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
" Remove functions
delf <sid>hi