aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--colors/base16-3024.vim8
-rw-r--r--colors/base16-apathy.vim8
-rw-r--r--colors/base16-ashes.vim8
-rw-r--r--colors/base16-atelier-cave-light.vim8
-rw-r--r--colors/base16-atelier-cave.vim8
-rw-r--r--colors/base16-atelier-dune-light.vim8
-rw-r--r--colors/base16-atelier-dune.vim8
-rw-r--r--colors/base16-atelier-estuary-light.vim8
-rw-r--r--colors/base16-atelier-estuary.vim8
-rw-r--r--colors/base16-atelier-forest-light.vim8
-rw-r--r--colors/base16-atelier-forest.vim8
-rw-r--r--colors/base16-atelier-heath-light.vim8
-rw-r--r--colors/base16-atelier-heath.vim8
-rw-r--r--colors/base16-atelier-lakeside-light.vim8
-rw-r--r--colors/base16-atelier-lakeside.vim8
-rw-r--r--colors/base16-atelier-plateau-light.vim8
-rw-r--r--colors/base16-atelier-plateau.vim8
-rw-r--r--colors/base16-atelier-savanna-light.vim8
-rw-r--r--colors/base16-atelier-savanna.vim8
-rw-r--r--colors/base16-atelier-seaside-light.vim8
-rw-r--r--colors/base16-atelier-seaside.vim8
-rw-r--r--colors/base16-atelier-sulphurpool-light.vim8
-rw-r--r--colors/base16-atelier-sulphurpool.vim8
-rw-r--r--colors/base16-bespin.vim8
-rw-r--r--colors/base16-brewer.vim8
-rw-r--r--colors/base16-bright.vim8
-rw-r--r--colors/base16-brushtrees-dark.vim8
-rw-r--r--colors/base16-brushtrees.vim8
-rw-r--r--colors/base16-chalk.vim8
-rw-r--r--colors/base16-circus.vim8
-rw-r--r--colors/base16-classic-dark.vim8
-rw-r--r--colors/base16-classic-light.vim8
-rw-r--r--colors/base16-codeschool.vim10
-rw-r--r--colors/base16-cupcake.vim8
-rw-r--r--colors/base16-cupertino.vim8
-rw-r--r--colors/base16-darktooth.vim8
-rw-r--r--colors/base16-default-dark-gnome.vim386
-rw-r--r--colors/base16-default-dark.vim8
-rw-r--r--colors/base16-default-light.vim8
-rw-r--r--colors/base16-dracula.vim8
-rw-r--r--colors/base16-eighties.vim8
-rw-r--r--colors/base16-embers.vim8
-rw-r--r--colors/base16-flat.vim8
-rw-r--r--colors/base16-github.vim8
-rw-r--r--colors/base16-google-dark.vim8
-rw-r--r--colors/base16-google-light.vim8
-rw-r--r--colors/base16-grayscale-dark.vim8
-rw-r--r--colors/base16-grayscale-light.vim8
-rw-r--r--colors/base16-greenscreen.vim8
-rw-r--r--colors/base16-gruvbox-dark-hard.vim8
-rw-r--r--colors/base16-gruvbox-dark-medium.vim8
-rw-r--r--colors/base16-gruvbox-dark-pale.vim8
-rw-r--r--colors/base16-gruvbox-dark-soft.vim8
-rw-r--r--colors/base16-gruvbox-light-hard.vim8
-rw-r--r--colors/base16-gruvbox-light-medium.vim8
-rw-r--r--colors/base16-gruvbox-light-soft.vim8
-rw-r--r--colors/base16-harmonic-dark.vim8
-rw-r--r--colors/base16-harmonic-light.vim8
-rw-r--r--colors/base16-hopscotch.vim8
-rw-r--r--colors/base16-icy.vim8
-rw-r--r--colors/base16-irblack.vim8
-rw-r--r--colors/base16-isotope.vim8
-rw-r--r--colors/base16-macintosh.vim8
-rw-r--r--colors/base16-marrakesh.vim8
-rw-r--r--colors/base16-materia.vim8
-rw-r--r--colors/base16-material-darker.vim8
-rw-r--r--colors/base16-material-lighter.vim8
-rw-r--r--colors/base16-material-palenight.vim8
-rw-r--r--colors/base16-material.vim8
-rw-r--r--colors/base16-mellow-purple.vim8
-rw-r--r--colors/base16-mexico-light.vim8
-rw-r--r--colors/base16-mocha.vim8
-rw-r--r--colors/base16-monokai.vim8
-rw-r--r--colors/base16-nord.vim8
-rw-r--r--colors/base16-ocean.vim8
-rw-r--r--colors/base16-oceanicnext.vim8
-rw-r--r--colors/base16-one-light.vim8
-rw-r--r--colors/base16-onedark.vim8
-rw-r--r--colors/base16-paraiso.vim8
-rw-r--r--colors/base16-phd.vim8
-rw-r--r--colors/base16-pico.vim8
-rw-r--r--colors/base16-pop.vim8
-rw-r--r--colors/base16-porple.vim8
-rw-r--r--colors/base16-railscasts.vim8
-rw-r--r--colors/base16-rebecca.vim8
-rw-r--r--colors/base16-seti.vim8
-rw-r--r--colors/base16-shapeshifter.vim8
-rw-r--r--colors/base16-solarflare.vim8
-rw-r--r--colors/base16-solarized-dark.vim8
-rw-r--r--colors/base16-solarized-light.vim8
-rw-r--r--colors/base16-spacemacs.vim8
-rw-r--r--colors/base16-summerfruit-dark.vim8
-rw-r--r--colors/base16-summerfruit-light.vim8
-rw-r--r--colors/base16-tomorrow-night.vim8
-rw-r--r--colors/base16-tomorrow.vim8
-rw-r--r--colors/base16-tube.vim8
-rw-r--r--colors/base16-twilight.vim8
-rw-r--r--colors/base16-unikitty-dark.vim8
-rw-r--r--colors/base16-unikitty-light.vim8
-rw-r--r--colors/base16-woodland.vim8
-rw-r--r--colors/base16-xcode-dusk.vim8
-rw-r--r--colors/base16-zenburn.vim8
-rw-r--r--templates/default.mustache8
103 files changed, 409 insertions, 795 deletions
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 4bb5f99..501f0c0 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index 7aae176..281e4b9 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 0c4161b..ba06ce3 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim
index 07a0059..d2a5ce9 100644
--- a/colors/base16-atelier-cave-light.vim
+++ b/colors/base16-atelier-cave-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim
index 2fc75db..1d7df53 100644
--- a/colors/base16-atelier-cave.vim
+++ b/colors/base16-atelier-cave.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim
index d49382e..626fdeb 100644
--- a/colors/base16-atelier-dune-light.vim
+++ b/colors/base16-atelier-dune-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim
index 545e7b2..6311473 100644
--- a/colors/base16-atelier-dune.vim
+++ b/colors/base16-atelier-dune.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim
index 24ff208..50204b7 100644
--- a/colors/base16-atelier-estuary-light.vim
+++ b/colors/base16-atelier-estuary-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim
index 187f7d7..6fa6726 100644
--- a/colors/base16-atelier-estuary.vim
+++ b/colors/base16-atelier-estuary.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim
index 003ff0d..ba203d8 100644
--- a/colors/base16-atelier-forest-light.vim
+++ b/colors/base16-atelier-forest-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim
index 0ea8932..4487626 100644
--- a/colors/base16-atelier-forest.vim
+++ b/colors/base16-atelier-forest.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim
index 881fc48..d4a1e0f 100644
--- a/colors/base16-atelier-heath-light.vim
+++ b/colors/base16-atelier-heath-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim
index b9138eb..e25da8e 100644
--- a/colors/base16-atelier-heath.vim
+++ b/colors/base16-atelier-heath.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim
index 43e5d69..f4877c2 100644
--- a/colors/base16-atelier-lakeside-light.vim
+++ b/colors/base16-atelier-lakeside-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim
index b974ecb..256ee27 100644
--- a/colors/base16-atelier-lakeside.vim
+++ b/colors/base16-atelier-lakeside.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim
index a653859..633fe1c 100644
--- a/colors/base16-atelier-plateau-light.vim
+++ b/colors/base16-atelier-plateau-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim
index 6b54756..e53a197 100644
--- a/colors/base16-atelier-plateau.vim
+++ b/colors/base16-atelier-plateau.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim
index f58d1ab..e3143c8 100644
--- a/colors/base16-atelier-savanna-light.vim
+++ b/colors/base16-atelier-savanna-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim
index dc2570d..58d5dd3 100644
--- a/colors/base16-atelier-savanna.vim
+++ b/colors/base16-atelier-savanna.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim
index 4b28985..f69e00e 100644
--- a/colors/base16-atelier-seaside-light.vim
+++ b/colors/base16-atelier-seaside-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim
index 944d7d3..86b8dbc 100644
--- a/colors/base16-atelier-seaside.vim
+++ b/colors/base16-atelier-seaside.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim
index 56081c0..e4ee3f1 100644
--- a/colors/base16-atelier-sulphurpool-light.vim
+++ b/colors/base16-atelier-sulphurpool-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim
index f6089aa..95c61cb 100644
--- a/colors/base16-atelier-sulphurpool.vim
+++ b/colors/base16-atelier-sulphurpool.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index d9fbacb..fc64bcf 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index 88c81a3..df48eb7 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index 0e032a2..2a3c41a 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim
index 0f737a4..7909ff2 100644
--- a/colors/base16-brushtrees-dark.vim
+++ b/colors/base16-brushtrees-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim
index e1462ae..4a0f65a 100644
--- a/colors/base16-brushtrees.vim
+++ b/colors/base16-brushtrees.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 7bd2db3..6ea9d56 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim
index 10a4e13..d68efdb 100644
--- a/colors/base16-circus.vim
+++ b/colors/base16-circus.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim
index 60ff764..d6e868f 100644
--- a/colors/base16-classic-dark.vim
+++ b/colors/base16-classic-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim
index 0441cb4..c62878f 100644
--- a/colors/base16-classic-light.vim
+++ b/colors/base16-classic-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index 8e0d84a..cc01d57 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -2,7 +2,7 @@
" base16-vim (https://github.com/chriskempson/base16-vim)
" by Chris Kempson (http://chriskempson.com)
-" Codeschool scheme by brettof86
+" Codeschool scheme by blockloop
" This enables the coresponding base16-shell script to run so that
" :colorscheme works in terminals supported by base16-shell scripts
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim
index a662293..74559bb 100644
--- a/colors/base16-cupcake.vim
+++ b/colors/base16-cupcake.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim
index 744fe87..b5b0611 100644
--- a/colors/base16-cupertino.vim
+++ b/colors/base16-cupertino.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim
index 8844075..e9aab16 100644
--- a/colors/base16-darktooth.vim
+++ b/colors/base16-darktooth.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-default-dark-gnome.vim b/colors/base16-default-dark-gnome.vim
deleted file mode 100644
index 2c69686..0000000
--- a/colors/base16-default-dark-gnome.vim
+++ /dev/null
@@ -1,386 +0,0 @@
-" vi:syntax=vim
-
-" base16-vim (https://github.com/chriskempson/base16-vim)
-" by Chris Kempson (http://chriskempson.com)
-" Default Dark Gnome scheme by Chris Kempson (http://chriskempson.com)
-
-" This enables the coresponding base16-shell script to run so that
-" :colorscheme works in terminals supported by base16-shell scripts
-" User must set this variable in .vimrc
-" let g:base16_shell_path=base16-builder/output/shell/
-if !has('gui_running')
- if exists("g:base16_shell_path")
- execute "silent !/bin/sh ".g:base16_shell_path."/base16-default-dark-gnome.sh"
- endif
-endif
-
-" GUI color definitions
-let s:gui00 = "1b1d1e"
-let g:base16_gui00 = "1b1d1e"
-let s:gui01 = "282b2d"
-let g:base16_gui01 = "282b2d"
-let s:gui02 = "363b3d"
-let g:base16_gui02 = "363b3d"
-let s:gui03 = "51585c"
-let g:base16_gui03 = "51585c"
-let s:gui04 = "b0b6b9"
-let g:base16_gui04 = "b0b6b9"
-let s:gui05 = "d2d5d7"
-let g:base16_gui05 = "d2d5d7"
-let s:gui06 = "e4e6e7"
-let g:base16_gui06 = "e4e6e7"
-let s:gui07 = "f5f6f6"
-let g:base16_gui07 = "f5f6f6"
-let s:gui08 = "ab4642"
-let g:base16_gui08 = "ab4642"
-let s:gui09 = "dc9656"
-let g:base16_gui09 = "dc9656"
-let s:gui0A = "f7ca88"
-let g:base16_gui0A = "f7ca88"
-let s:gui0B = "a1b56c"
-let g:base16_gui0B = "a1b56c"
-let s:gui0C = "86c1b9"
-let g:base16_gui0C = "86c1b9"
-let s:gui0D = "7cafc2"
-let g:base16_gui0D = "7cafc2"
-let s:gui0E = "ba8baf"
-let g:base16_gui0E = "ba8baf"
-let s:gui0F = "a16946"
-let g:base16_gui0F = "a16946"
-
-" Terminal color definitions
-let s:cterm00 = "00"
-let g:base16_cterm00 = "00"
-let s:cterm03 = "08"
-let g:base16_cterm03 = "08"
-let s:cterm05 = "07"
-let g:base16_cterm05 = "07"
-let s:cterm07 = "15"
-let g:base16_cterm07 = "15"
-let s:cterm08 = "01"
-let g:base16_cterm08 = "01"
-let s:cterm0A = "03"
-let g:base16_cterm0A = "03"
-let s:cterm0B = "02"
-let g:base16_cterm0B = "02"
-let s:cterm0C = "06"
-let g:base16_cterm0C = "06"
-let s:cterm0D = "04"
-let g:base16_cterm0D = "04"
-let s:cterm0E = "05"
-let g:base16_cterm0E = "05"
-if exists('base16colorspace') && base16colorspace == "256"
- let s:cterm01 = "18"
- let g:base16_cterm01 = "18"
- let s:cterm02 = "19"
- let g:base16_cterm02 = "19"
- let s:cterm04 = "20"
- let g:base16_cterm04 = "20"
- let s:cterm06 = "21"
- let g:base16_cterm06 = "21"
- let s:cterm09 = "16"
- let g:base16_cterm09 = "16"
- let s:cterm0F = "17"
- let g:base16_cterm0F = "17"
-else
- let s:cterm01 = "10"
- let g:base16_cterm01 = "10"
- let s:cterm02 = "11"
- let g:base16_cterm02 = "11"
- let s:cterm04 = "12"
- let g:base16_cterm04 = "12"
- let s:cterm06 = "13"
- let g:base16_cterm06 = "13"
- let s:cterm09 = "09"
- let g:base16_cterm09 = "09"
- let s:cterm0F = "14"
- let g:base16_cterm0F = "14"
-endif
-
-" Neovim terminal colours
-if has("nvim")
- let g:terminal_color_0 = "#1b1d1e"
- let g:terminal_color_1 = "#ab4642"
- let g:terminal_color_2 = "#a1b56c"
- let g:terminal_color_3 = "#f7ca88"
- let g:terminal_color_4 = "#7cafc2"
- let g:terminal_color_5 = "#ba8baf"
- let g:terminal_color_6 = "#86c1b9"
- let g:terminal_color_7 = "#d2d5d7"
- let g:terminal_color_8 = "#51585c"
- let g:terminal_color_9 = "#ab4642"
- let g:terminal_color_10 = "#a1b56c"
- let g:terminal_color_11 = "#f7ca88"
- let g:terminal_color_12 = "#7cafc2"
- let g:terminal_color_13 = "#ba8baf"
- let g:terminal_color_14 = "#86c1b9"
- let g:terminal_color_15 = "#f5f6f6"
- let g:terminal_color_background = g:terminal_color_0
- let g:terminal_color_foreground = g:terminal_color_5
- if &background == "light"
- let g:terminal_color_background = g:terminal_color_7
- let g:terminal_color_foreground = g:terminal_color_2
- endif
-endif
-
-" Theme setup
-hi clear
-syntax reset
-let g:colors_name = "base16-default-dark-gnome"
-
-" Highlighting function
-function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
- if a:guifg != ""
- exec "hi " . a:group . " guifg=#" . a:guifg
- endif
- if a:guibg != ""
- exec "hi " . a:group . " guibg=#" . a:guibg
- endif
- if a:ctermfg != ""
- exec "hi " . a:group . " ctermfg=" . a:ctermfg
- endif
- if a:ctermbg != ""
- exec "hi " . a:group . " ctermbg=" . a:ctermbg
- endif
- if a:attr != ""
- exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
- endif
- if a:guisp != ""
- exec "hi " . a:group . " guisp=#" . a:guisp
- endif
-endfunction
-
-
-fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
- call Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp)
-endfun
-
-" Vim editor colors
-call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
-call <sid>hi("Bold", "", "", "", "", "bold", "")
-call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
-call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
-call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
-call <sid>hi("Italic", "", "", "", "", "none", "")
-call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "")
-call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "")
-call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "")
-call <sid>hi("Substitute", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "none", "")
-call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "")
-call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "")
-call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "")
-call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
-call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
-call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
-call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
-call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "")
-call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "")
-call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "")
-call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "")
-call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
-call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
-
-" Standard syntax highlighting
-call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "")
-call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "")
-call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "")
-call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "")
-call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "")
-call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "")
-call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "")
-call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "")
-call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "")
-call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "")
-call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
-call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "")
-call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "")
-
-" C highlighting
-call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "")
-
-" C# highlighting
-call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "")
-
-" 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, "", "", "")
-
-" 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, "", "")
-call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
-call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
-call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
-call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
-call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
-
-" Git highlighting
-call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "")
-call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "")
-call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "")
-call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "")
-call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "")
-
-" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
-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, "", "", "")
-call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "")
-call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "")
-
-" 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, "", "", "")
-" pangloss/vim-javascript highlighting
-call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "")
-call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "")
-
-" Mail highlighting
-call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "")
-call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "")
-call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "")
-call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "")
-
-" Markdown 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, "", "", "")
-
-" 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, "", "", "")
-call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("pythonStatement", 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("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, "", "")
-
-" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
-
-" Startify highlighting
-call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "")
-call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "")
-call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "")
-call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "")
-call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "")
-call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "")
-call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "")
-
-" Remove functions
-delf <sid>hi
-
-" Remove color variables
-unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim
index 684cc82..f6b4384 100644
--- a/colors/base16-default-dark.vim
+++ b/colors/base16-default-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim
index d055851..a41d57c 100644
--- a/colors/base16-default-light.vim
+++ b/colors/base16-default-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim
index c66d21e..360143e 100644
--- a/colors/base16-dracula.vim
+++ b/colors/base16-dracula.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index dc3840b..0cf9f2b 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index efce17a..ab7e31d 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index de94dc8..3673135 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-github.vim b/colors/base16-github.vim
index 66f6701..9e53143 100644
--- a/colors/base16-github.vim
+++ b/colors/base16-github.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim
index c62e124..fa529dc 100644
--- a/colors/base16-google-dark.vim
+++ b/colors/base16-google-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim
index 6a103e6..480ad3c 100644
--- a/colors/base16-google-light.vim
+++ b/colors/base16-google-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim
index b7ba02f..af68082 100644
--- a/colors/base16-grayscale-dark.vim
+++ b/colors/base16-grayscale-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim
index dd84dc9..ef39520 100644
--- a/colors/base16-grayscale-light.vim
+++ b/colors/base16-grayscale-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index 1d07192..5eda4f3 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim
index 96aa868..5388fb6 100644
--- a/colors/base16-gruvbox-dark-hard.vim
+++ b/colors/base16-gruvbox-dark-hard.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim
index 8c61278..434830f 100644
--- a/colors/base16-gruvbox-dark-medium.vim
+++ b/colors/base16-gruvbox-dark-medium.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim
index 154014a..19d067f 100644
--- a/colors/base16-gruvbox-dark-pale.vim
+++ b/colors/base16-gruvbox-dark-pale.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim
index faecf41..fd58957 100644
--- a/colors/base16-gruvbox-dark-soft.vim
+++ b/colors/base16-gruvbox-dark-soft.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim
index f76bf4f..13bead7 100644
--- a/colors/base16-gruvbox-light-hard.vim
+++ b/colors/base16-gruvbox-light-hard.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim
index e5f3dc5..cfab15a 100644
--- a/colors/base16-gruvbox-light-medium.vim
+++ b/colors/base16-gruvbox-light-medium.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim
index 7a2df34..1c380a8 100644
--- a/colors/base16-gruvbox-light-soft.vim
+++ b/colors/base16-gruvbox-light-soft.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim
index a35cb2a..8588cb9 100644
--- a/colors/base16-harmonic-dark.vim
+++ b/colors/base16-harmonic-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim
index 5308c63..5a52620 100644
--- a/colors/base16-harmonic-light.vim
+++ b/colors/base16-harmonic-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim
index 44cd20d..5bebc85 100644
--- a/colors/base16-hopscotch.vim
+++ b/colors/base16-hopscotch.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim
index dbfe60e..05eb06d 100644
--- a/colors/base16-icy.vim
+++ b/colors/base16-icy.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim
index ee99af6..d6c93a5 100644
--- a/colors/base16-irblack.vim
+++ b/colors/base16-irblack.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index 361927c..f98996e 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim
index 9935ed2..a0c9d87 100644
--- a/colors/base16-macintosh.vim
+++ b/colors/base16-macintosh.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index a0f2c8f..8d8f9db 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim
index 6859fec..833cc20 100644
--- a/colors/base16-materia.vim
+++ b/colors/base16-materia.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim
index 6d1a81d..f4a441a 100644
--- a/colors/base16-material-darker.vim
+++ b/colors/base16-material-darker.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim
index a183f00..883103f 100644
--- a/colors/base16-material-lighter.vim
+++ b/colors/base16-material-lighter.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim
index 62f43ac..3309dc0 100644
--- a/colors/base16-material-palenight.vim
+++ b/colors/base16-material-palenight.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-material.vim b/colors/base16-material.vim
index 195d7a9..fbaf8f3 100644
--- a/colors/base16-material.vim
+++ b/colors/base16-material.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim
index deec9b7..548d01c 100644
--- a/colors/base16-mellow-purple.vim
+++ b/colors/base16-mellow-purple.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim
index 5187b8f..830183d 100644
--- a/colors/base16-mexico-light.vim
+++ b/colors/base16-mexico-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 633464b..f36c4f8 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index ebe1e65..dde32b5 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim
index 183270b..e64bf4c 100644
--- a/colors/base16-nord.vim
+++ b/colors/base16-nord.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 9677dcc..22f59ac 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim
index 58825ae..7b1e61b 100644
--- a/colors/base16-oceanicnext.vim
+++ b/colors/base16-oceanicnext.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim
index 0ac84ae..3d5e4cd 100644
--- a/colors/base16-one-light.vim
+++ b/colors/base16-one-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim
index 632f218..3619eca 100644
--- a/colors/base16-onedark.vim
+++ b/colors/base16-onedark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index ebe4905..33751fb 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim
index a122932..b77ed79 100644
--- a/colors/base16-phd.vim
+++ b/colors/base16-phd.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim
index 99ca49d..ae3f83b 100644
--- a/colors/base16-pico.vim
+++ b/colors/base16-pico.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim
index 65a014d..87e093f 100644
--- a/colors/base16-pop.vim
+++ b/colors/base16-pop.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim
index 5a38cc1..8cfc06d 100644
--- a/colors/base16-porple.vim
+++ b/colors/base16-porple.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index c96b714..fe25135 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim
index 69670e8..867244b 100644
--- a/colors/base16-rebecca.vim
+++ b/colors/base16-rebecca.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim
index 0c91a43..cc1c9ac 100644
--- a/colors/base16-seti.vim
+++ b/colors/base16-seti.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index 1ecf398..4cc65c5 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim
index 43ae22c..b2e0d71 100644
--- a/colors/base16-solarflare.vim
+++ b/colors/base16-solarflare.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim
index c765500..5def314 100644
--- a/colors/base16-solarized-dark.vim
+++ b/colors/base16-solarized-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim
index a4c666b..a69463a 100644
--- a/colors/base16-solarized-light.vim
+++ b/colors/base16-solarized-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim
index 3c5ca00..3a315a1 100644
--- a/colors/base16-spacemacs.vim
+++ b/colors/base16-spacemacs.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim
index 8d2c179..ecaacce 100644
--- a/colors/base16-summerfruit-dark.vim
+++ b/colors/base16-summerfruit-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim
index 2597db9..416976b 100644
--- a/colors/base16-summerfruit-light.vim
+++ b/colors/base16-summerfruit-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim
index 8a9df88..58ec956 100644
--- a/colors/base16-tomorrow-night.vim
+++ b/colors/base16-tomorrow-night.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index b410b70..15757e3 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim
index f31338e..55174a7 100644
--- a/colors/base16-tube.vim
+++ b/colors/base16-tube.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index 1cd0c5c..852fff6 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim
index ebb8f91..f122ca0 100644
--- a/colors/base16-unikitty-dark.vim
+++ b/colors/base16-unikitty-dark.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim
index 5cf4bfd..ecb4223 100644
--- a/colors/base16-unikitty-light.vim
+++ b/colors/base16-unikitty-light.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim
index b18d846..f36b9a4 100644
--- a/colors/base16-woodland.vim
+++ b/colors/base16-woodland.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim
index 45ba8be..03a0cf3 100644
--- a/colors/base16-xcode-dusk.vim
+++ b/colors/base16-xcode-dusk.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim
index a397e32..7fe099e 100644
--- a/colors/base16-zenburn.vim
+++ b/colors/base16-zenburn.vim
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")
diff --git a/templates/default.mustache b/templates/default.mustache
index a880e82..a347e26 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -361,10 +361,10 @@ call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "
call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+call <sid>hi("SpellBad", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", s:gui05, s:gui00, s:cterm05, s:cterm00, "undercurl", s:gui0E)
" Startify highlighting
call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "")