aboutsummaryrefslogtreecommitdiff
path: root/colors
diff options
context:
space:
mode:
Diffstat (limited to 'colors')
-rw-r--r--colors/base16-3024.vim20
-rw-r--r--colors/base16-apathy.vim20
-rw-r--r--colors/base16-apprentice.vim20
-rw-r--r--colors/base16-ashes.vim20
-rw-r--r--colors/base16-atelier-cave-light.vim20
-rw-r--r--colors/base16-atelier-cave.vim20
-rw-r--r--colors/base16-atelier-dune-light.vim20
-rw-r--r--colors/base16-atelier-dune.vim20
-rw-r--r--colors/base16-atelier-estuary-light.vim20
-rw-r--r--colors/base16-atelier-estuary.vim20
-rw-r--r--colors/base16-atelier-forest-light.vim20
-rw-r--r--colors/base16-atelier-forest.vim20
-rw-r--r--colors/base16-atelier-heath-light.vim20
-rw-r--r--colors/base16-atelier-heath.vim20
-rw-r--r--colors/base16-atelier-lakeside-light.vim20
-rw-r--r--colors/base16-atelier-lakeside.vim20
-rw-r--r--colors/base16-atelier-plateau-light.vim20
-rw-r--r--colors/base16-atelier-plateau.vim20
-rw-r--r--colors/base16-atelier-savanna-light.vim20
-rw-r--r--colors/base16-atelier-savanna.vim20
-rw-r--r--colors/base16-atelier-seaside-light.vim20
-rw-r--r--colors/base16-atelier-seaside.vim20
-rw-r--r--colors/base16-atelier-sulphurpool-light.vim20
-rw-r--r--colors/base16-atelier-sulphurpool.vim20
-rw-r--r--colors/base16-atlas.vim20
-rw-r--r--colors/base16-bespin.vim20
-rw-r--r--colors/base16-black-metal-bathory.vim20
-rw-r--r--colors/base16-black-metal-burzum.vim20
-rw-r--r--colors/base16-black-metal-dark-funeral.vim20
-rw-r--r--colors/base16-black-metal-gorgoroth.vim20
-rw-r--r--colors/base16-black-metal-immortal.vim20
-rw-r--r--colors/base16-black-metal-khold.vim20
-rw-r--r--colors/base16-black-metal-marduk.vim20
-rw-r--r--colors/base16-black-metal-mayhem.vim20
-rw-r--r--colors/base16-black-metal-nile.vim20
-rw-r--r--colors/base16-black-metal-venom.vim20
-rw-r--r--colors/base16-black-metal.vim20
-rw-r--r--colors/base16-brewer.vim20
-rw-r--r--colors/base16-bright.vim20
-rw-r--r--colors/base16-brogrammer.vim20
-rw-r--r--colors/base16-brushtrees-dark.vim20
-rw-r--r--colors/base16-brushtrees.vim20
-rw-r--r--colors/base16-chalk.vim20
-rw-r--r--colors/base16-circus.vim20
-rw-r--r--colors/base16-classic-dark.vim20
-rw-r--r--colors/base16-classic-light.vim20
-rw-r--r--colors/base16-codeschool.vim20
-rw-r--r--colors/base16-cupcake.vim20
-rw-r--r--colors/base16-cupertino.vim20
-rw-r--r--colors/base16-danqing.vim20
-rw-r--r--colors/base16-darcula.vim20
-rw-r--r--colors/base16-darkmoss.vim20
-rw-r--r--colors/base16-darktooth.vim20
-rw-r--r--colors/base16-darkviolet.vim20
-rw-r--r--colors/base16-decaf.vim20
-rw-r--r--colors/base16-default-dark.vim20
-rw-r--r--colors/base16-default-light.vim20
-rw-r--r--colors/base16-dirtysea.vim20
-rw-r--r--colors/base16-dracula.vim20
-rw-r--r--colors/base16-edge-dark.vim20
-rw-r--r--colors/base16-edge-light.vim20
-rw-r--r--colors/base16-eighties.vim20
-rw-r--r--colors/base16-embers.vim20
-rw-r--r--colors/base16-equilibrium-dark.vim20
-rw-r--r--colors/base16-equilibrium-gray-dark.vim20
-rw-r--r--colors/base16-equilibrium-gray-light.vim20
-rw-r--r--colors/base16-equilibrium-light.vim20
-rw-r--r--colors/base16-espresso.vim20
-rw-r--r--colors/base16-eva-dim.vim20
-rw-r--r--colors/base16-eva.vim20
-rw-r--r--colors/base16-flat.vim20
-rw-r--r--colors/base16-framer.vim20
-rw-r--r--colors/base16-fruit-soda.vim20
-rw-r--r--colors/base16-gigavolt.vim20
-rw-r--r--colors/base16-github.vim20
-rw-r--r--colors/base16-google-dark.vim20
-rw-r--r--colors/base16-google-light.vim20
-rw-r--r--colors/base16-grayscale-dark.vim20
-rw-r--r--colors/base16-grayscale-light.vim20
-rw-r--r--colors/base16-greenscreen.vim20
-rw-r--r--colors/base16-gruvbox-dark-hard.vim20
-rw-r--r--colors/base16-gruvbox-dark-medium.vim20
-rw-r--r--colors/base16-gruvbox-dark-pale.vim20
-rw-r--r--colors/base16-gruvbox-dark-soft.vim20
-rw-r--r--colors/base16-gruvbox-light-hard.vim20
-rw-r--r--colors/base16-gruvbox-light-medium.vim20
-rw-r--r--colors/base16-gruvbox-light-soft.vim20
-rw-r--r--colors/base16-hardcore.vim20
-rw-r--r--colors/base16-harmonic-dark.vim20
-rw-r--r--colors/base16-harmonic-light.vim20
-rw-r--r--colors/base16-heetch-light.vim20
-rw-r--r--colors/base16-heetch.vim20
-rw-r--r--colors/base16-helios.vim20
-rw-r--r--colors/base16-hopscotch.vim20
-rw-r--r--colors/base16-horizon-dark.vim20
-rw-r--r--colors/base16-horizon-light.vim20
-rw-r--r--colors/base16-horizon-terminal-dark.vim20
-rw-r--r--colors/base16-horizon-terminal-light.vim20
-rw-r--r--colors/base16-humanoid-dark.vim20
-rw-r--r--colors/base16-humanoid-light.vim20
-rw-r--r--colors/base16-ia-dark.vim20
-rw-r--r--colors/base16-ia-light.vim20
-rw-r--r--colors/base16-icy.vim20
-rw-r--r--colors/base16-irblack.vim20
-rw-r--r--colors/base16-isotope.vim20
-rw-r--r--colors/base16-kimber.vim20
-rw-r--r--colors/base16-macintosh.vim20
-rw-r--r--colors/base16-marrakesh.vim20
-rw-r--r--colors/base16-materia.vim20
-rw-r--r--colors/base16-material-darker.vim20
-rw-r--r--colors/base16-material-lighter.vim20
-rw-r--r--colors/base16-material-palenight.vim20
-rw-r--r--colors/base16-material-vivid.vim20
-rw-r--r--colors/base16-material.vim20
-rw-r--r--colors/base16-mellow-purple.vim20
-rw-r--r--colors/base16-mexico-light.vim20
-rw-r--r--colors/base16-mocha.vim20
-rw-r--r--colors/base16-monokai.vim20
-rw-r--r--colors/base16-nebula.vim20
-rw-r--r--colors/base16-nord.vim20
-rw-r--r--colors/base16-nova.vim20
-rw-r--r--colors/base16-ocean.vim20
-rw-r--r--colors/base16-oceanicnext.vim20
-rw-r--r--colors/base16-one-light.vim20
-rw-r--r--colors/base16-onedark.vim20
-rw-r--r--colors/base16-outrun-dark.vim20
-rw-r--r--colors/base16-papercolor-dark.vim20
-rw-r--r--colors/base16-papercolor-light.vim20
-rw-r--r--colors/base16-paraiso.vim20
-rw-r--r--colors/base16-pasque.vim20
-rw-r--r--colors/base16-phd.vim20
-rw-r--r--colors/base16-pico.vim20
-rw-r--r--colors/base16-pinky.vim20
-rw-r--r--colors/base16-pop.vim20
-rw-r--r--colors/base16-porple.vim20
-rw-r--r--colors/base16-qualia.vim20
-rw-r--r--colors/base16-railscasts.vim20
-rw-r--r--colors/base16-rebecca.vim20
-rw-r--r--colors/base16-rose-pine-dawn.vim20
-rw-r--r--colors/base16-rose-pine-moon.vim20
-rw-r--r--colors/base16-rose-pine.vim20
-rw-r--r--colors/base16-sagelight.vim20
-rw-r--r--colors/base16-sakura.vim20
-rw-r--r--colors/base16-sandcastle.vim20
-rw-r--r--colors/base16-seti.vim20
-rw-r--r--colors/base16-shades-of-purple.vim20
-rw-r--r--colors/base16-shapeshifter.vim20
-rw-r--r--colors/base16-silk-dark.vim20
-rw-r--r--colors/base16-silk-light.vim20
-rw-r--r--colors/base16-snazzy.vim20
-rw-r--r--colors/base16-solarflare-light.vim20
-rw-r--r--colors/base16-solarflare.vim20
-rw-r--r--colors/base16-solarized-dark.vim20
-rw-r--r--colors/base16-solarized-light.vim20
-rw-r--r--colors/base16-spacemacs.vim20
-rw-r--r--colors/base16-summercamp.vim20
-rw-r--r--colors/base16-summerfruit-dark.vim20
-rw-r--r--colors/base16-summerfruit-light.vim20
-rw-r--r--colors/base16-synth-midnight-dark.vim20
-rw-r--r--colors/base16-synth-midnight-light.vim20
-rw-r--r--colors/base16-tango.vim20
-rw-r--r--colors/base16-tender.vim20
-rw-r--r--colors/base16-tomorrow-night-eighties.vim20
-rw-r--r--colors/base16-tomorrow-night.vim20
-rw-r--r--colors/base16-tomorrow.vim20
-rw-r--r--colors/base16-tube.vim20
-rw-r--r--colors/base16-twilight.vim20
-rw-r--r--colors/base16-unikitty-dark.vim20
-rw-r--r--colors/base16-unikitty-light.vim20
-rw-r--r--colors/base16-vulcan.vim20
-rw-r--r--colors/base16-windows-10-light.vim20
-rw-r--r--colors/base16-windows-10.vim20
-rw-r--r--colors/base16-windows-95-light.vim20
-rw-r--r--colors/base16-windows-95.vim20
-rw-r--r--colors/base16-windows-highcontrast-light.vim20
-rw-r--r--colors/base16-windows-highcontrast.vim20
-rw-r--r--colors/base16-windows-nt-light.vim20
-rw-r--r--colors/base16-windows-nt.vim20
-rw-r--r--colors/base16-woodland.vim20
-rw-r--r--colors/base16-xcode-dusk.vim20
-rw-r--r--colors/base16-zenburn.vim20
181 files changed, 1810 insertions, 1810 deletions
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 41402a1..3ebd391 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index d5db330..2d09298 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-apprentice.vim b/colors/base16-apprentice.vim
index 225be86..10cdf36 100644
--- a/colors/base16-apprentice.vim
+++ b/colors/base16-apprentice.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index f147e41..bbc2262 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim
index 72be8c5..bd89992 100644
--- a/colors/base16-atelier-cave-light.vim
+++ b/colors/base16-atelier-cave-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim
index 9fe0379..d9a1e3c 100644
--- a/colors/base16-atelier-cave.vim
+++ b/colors/base16-atelier-cave.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim
index 487f0ea..6b9dd85 100644
--- a/colors/base16-atelier-dune-light.vim
+++ b/colors/base16-atelier-dune-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim
index a9692a3..41b115b 100644
--- a/colors/base16-atelier-dune.vim
+++ b/colors/base16-atelier-dune.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim
index 6634df5..982a543 100644
--- a/colors/base16-atelier-estuary-light.vim
+++ b/colors/base16-atelier-estuary-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim
index f668381..bf4a525 100644
--- a/colors/base16-atelier-estuary.vim
+++ b/colors/base16-atelier-estuary.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim
index 92e1898..bf35005 100644
--- a/colors/base16-atelier-forest-light.vim
+++ b/colors/base16-atelier-forest-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim
index c8d4894..597cd58 100644
--- a/colors/base16-atelier-forest.vim
+++ b/colors/base16-atelier-forest.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim
index a3e7a1a..58fec78 100644
--- a/colors/base16-atelier-heath-light.vim
+++ b/colors/base16-atelier-heath-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim
index 4500dce..3d382a7 100644
--- a/colors/base16-atelier-heath.vim
+++ b/colors/base16-atelier-heath.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim
index 3dc6fc8..344c42a 100644
--- a/colors/base16-atelier-lakeside-light.vim
+++ b/colors/base16-atelier-lakeside-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim
index 3b02105..3f1d176 100644
--- a/colors/base16-atelier-lakeside.vim
+++ b/colors/base16-atelier-lakeside.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim
index 5fee755..646928f 100644
--- a/colors/base16-atelier-plateau-light.vim
+++ b/colors/base16-atelier-plateau-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim
index 3938e0e..0885f84 100644
--- a/colors/base16-atelier-plateau.vim
+++ b/colors/base16-atelier-plateau.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim
index 04c3aa8..4bf9571 100644
--- a/colors/base16-atelier-savanna-light.vim
+++ b/colors/base16-atelier-savanna-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim
index 713a93e..b193ade 100644
--- a/colors/base16-atelier-savanna.vim
+++ b/colors/base16-atelier-savanna.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim
index bafeaa0..43bc658 100644
--- a/colors/base16-atelier-seaside-light.vim
+++ b/colors/base16-atelier-seaside-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim
index a3bcf61..36c2929 100644
--- a/colors/base16-atelier-seaside.vim
+++ b/colors/base16-atelier-seaside.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim
index fbe78c8..e6e6b92 100644
--- a/colors/base16-atelier-sulphurpool-light.vim
+++ b/colors/base16-atelier-sulphurpool-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim
index ab41558..7080440 100644
--- a/colors/base16-atelier-sulphurpool.vim
+++ b/colors/base16-atelier-sulphurpool.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-atlas.vim b/colors/base16-atlas.vim
index 5b4da0d..aa5c99e 100644
--- a/colors/base16-atlas.vim
+++ b/colors/base16-atlas.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index c3f90f6..4801a76 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-bathory.vim b/colors/base16-black-metal-bathory.vim
index 2d22ad9..1a60853 100644
--- a/colors/base16-black-metal-bathory.vim
+++ b/colors/base16-black-metal-bathory.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-burzum.vim b/colors/base16-black-metal-burzum.vim
index 6f208cf..6b29522 100644
--- a/colors/base16-black-metal-burzum.vim
+++ b/colors/base16-black-metal-burzum.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-dark-funeral.vim b/colors/base16-black-metal-dark-funeral.vim
index 45c94d0..8342c5d 100644
--- a/colors/base16-black-metal-dark-funeral.vim
+++ b/colors/base16-black-metal-dark-funeral.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-gorgoroth.vim b/colors/base16-black-metal-gorgoroth.vim
index 02121a9..7a40086 100644
--- a/colors/base16-black-metal-gorgoroth.vim
+++ b/colors/base16-black-metal-gorgoroth.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-immortal.vim b/colors/base16-black-metal-immortal.vim
index 6ff0290..3844284 100644
--- a/colors/base16-black-metal-immortal.vim
+++ b/colors/base16-black-metal-immortal.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-khold.vim b/colors/base16-black-metal-khold.vim
index 5a6709c..d842c1f 100644
--- a/colors/base16-black-metal-khold.vim
+++ b/colors/base16-black-metal-khold.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-marduk.vim b/colors/base16-black-metal-marduk.vim
index f821347..e4ad8bb 100644
--- a/colors/base16-black-metal-marduk.vim
+++ b/colors/base16-black-metal-marduk.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-mayhem.vim b/colors/base16-black-metal-mayhem.vim
index ddf8384..04155fe 100644
--- a/colors/base16-black-metal-mayhem.vim
+++ b/colors/base16-black-metal-mayhem.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-nile.vim b/colors/base16-black-metal-nile.vim
index f402435..2d3b32a 100644
--- a/colors/base16-black-metal-nile.vim
+++ b/colors/base16-black-metal-nile.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal-venom.vim b/colors/base16-black-metal-venom.vim
index f1c5dd7..75b4950 100644
--- a/colors/base16-black-metal-venom.vim
+++ b/colors/base16-black-metal-venom.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-black-metal.vim b/colors/base16-black-metal.vim
index 4be6085..1f75e59 100644
--- a/colors/base16-black-metal.vim
+++ b/colors/base16-black-metal.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index aa2b308..79c9170 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index 89fba23..4a413a7 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-brogrammer.vim b/colors/base16-brogrammer.vim
index 2292ccf..4712bc9 100644
--- a/colors/base16-brogrammer.vim
+++ b/colors/base16-brogrammer.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim
index bb808ca..7cec7e8 100644
--- a/colors/base16-brushtrees-dark.vim
+++ b/colors/base16-brushtrees-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim
index 260710b..adb1c58 100644
--- a/colors/base16-brushtrees.vim
+++ b/colors/base16-brushtrees.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 0c63286..a9706f6 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim
index 20159b7..63f3931 100644
--- a/colors/base16-circus.vim
+++ b/colors/base16-circus.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim
index 4fe1293..9d6f121 100644
--- a/colors/base16-classic-dark.vim
+++ b/colors/base16-classic-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim
index b6183d4..076b813 100644
--- a/colors/base16-classic-light.vim
+++ b/colors/base16-classic-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index fcb6dbd..cd1d9e4 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim
index d383e8e..fe4cddf 100644
--- a/colors/base16-cupcake.vim
+++ b/colors/base16-cupcake.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim
index 3788214..9f1099a 100644
--- a/colors/base16-cupertino.vim
+++ b/colors/base16-cupertino.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-danqing.vim b/colors/base16-danqing.vim
index 653a47c..98852fa 100644
--- a/colors/base16-danqing.vim
+++ b/colors/base16-danqing.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-darcula.vim b/colors/base16-darcula.vim
index dfa8f00..646bf81 100644
--- a/colors/base16-darcula.vim
+++ b/colors/base16-darcula.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-darkmoss.vim b/colors/base16-darkmoss.vim
index 2a9e1a2..458982e 100644
--- a/colors/base16-darkmoss.vim
+++ b/colors/base16-darkmoss.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim
index dc9e576..1e5e78d 100644
--- a/colors/base16-darktooth.vim
+++ b/colors/base16-darktooth.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-darkviolet.vim b/colors/base16-darkviolet.vim
index 8eb8b9d..e9a835d 100644
--- a/colors/base16-darkviolet.vim
+++ b/colors/base16-darkviolet.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-decaf.vim b/colors/base16-decaf.vim
index 57f659b..c888ad9 100644
--- a/colors/base16-decaf.vim
+++ b/colors/base16-decaf.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim
index 27cc188..8e1ffe3 100644
--- a/colors/base16-default-dark.vim
+++ b/colors/base16-default-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim
index 390df5a..7423abc 100644
--- a/colors/base16-default-light.vim
+++ b/colors/base16-default-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-dirtysea.vim b/colors/base16-dirtysea.vim
index 421bfbe..a8e6863 100644
--- a/colors/base16-dirtysea.vim
+++ b/colors/base16-dirtysea.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim
index 72d6033..3a45b48 100644
--- a/colors/base16-dracula.vim
+++ b/colors/base16-dracula.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-edge-dark.vim b/colors/base16-edge-dark.vim
index eddaa46..897b680 100644
--- a/colors/base16-edge-dark.vim
+++ b/colors/base16-edge-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-edge-light.vim b/colors/base16-edge-light.vim
index f42957f..fffdb4b 100644
--- a/colors/base16-edge-light.vim
+++ b/colors/base16-edge-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index e959226..a0d0c9e 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 2a6dfe3..ecd03c3 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-equilibrium-dark.vim b/colors/base16-equilibrium-dark.vim
index ca3551a..6e4eef6 100644
--- a/colors/base16-equilibrium-dark.vim
+++ b/colors/base16-equilibrium-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-equilibrium-gray-dark.vim b/colors/base16-equilibrium-gray-dark.vim
index 50328cc..46a5af0 100644
--- a/colors/base16-equilibrium-gray-dark.vim
+++ b/colors/base16-equilibrium-gray-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-equilibrium-gray-light.vim b/colors/base16-equilibrium-gray-light.vim
index cf52f44..76a4924 100644
--- a/colors/base16-equilibrium-gray-light.vim
+++ b/colors/base16-equilibrium-gray-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-equilibrium-light.vim b/colors/base16-equilibrium-light.vim
index 11c4228..51d4ef7 100644
--- a/colors/base16-equilibrium-light.vim
+++ b/colors/base16-equilibrium-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-espresso.vim b/colors/base16-espresso.vim
index 1002f71..38aa56f 100644
--- a/colors/base16-espresso.vim
+++ b/colors/base16-espresso.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-eva-dim.vim b/colors/base16-eva-dim.vim
index 1b0a66f..7038314 100644
--- a/colors/base16-eva-dim.vim
+++ b/colors/base16-eva-dim.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-eva.vim b/colors/base16-eva.vim
index 5984e1d..9f4f9d2 100644
--- a/colors/base16-eva.vim
+++ b/colors/base16-eva.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index ae4b521..9963ed4 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-framer.vim b/colors/base16-framer.vim
index 9eb71c7..b76fac2 100644
--- a/colors/base16-framer.vim
+++ b/colors/base16-framer.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-fruit-soda.vim b/colors/base16-fruit-soda.vim
index d3f3f75..f844052 100644
--- a/colors/base16-fruit-soda.vim
+++ b/colors/base16-fruit-soda.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-gigavolt.vim b/colors/base16-gigavolt.vim
index 40264a0..a108d90 100644
--- a/colors/base16-gigavolt.vim
+++ b/colors/base16-gigavolt.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-github.vim b/colors/base16-github.vim
index 43e8944..46cab52 100644
--- a/colors/base16-github.vim
+++ b/colors/base16-github.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim
index 924bcd1..9b2f5cf 100644
--- a/colors/base16-google-dark.vim
+++ b/colors/base16-google-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim
index 364f212..c6b7b47 100644
--- a/colors/base16-google-light.vim
+++ b/colors/base16-google-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim
index fa38624..8fd052c 100644
--- a/colors/base16-grayscale-dark.vim
+++ b/colors/base16-grayscale-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim
index 15bc42b..a883576 100644
--- a/colors/base16-grayscale-light.vim
+++ b/colors/base16-grayscale-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index 85f12ee..7ecf134 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim
index 33efe30..ae24afb 100644
--- a/colors/base16-gruvbox-dark-hard.vim
+++ b/colors/base16-gruvbox-dark-hard.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim
index 8082894..986c0c2 100644
--- a/colors/base16-gruvbox-dark-medium.vim
+++ b/colors/base16-gruvbox-dark-medium.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim
index 46d0cb6..d1e1a21 100644
--- a/colors/base16-gruvbox-dark-pale.vim
+++ b/colors/base16-gruvbox-dark-pale.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim
index adef743..55a887f 100644
--- a/colors/base16-gruvbox-dark-soft.vim
+++ b/colors/base16-gruvbox-dark-soft.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim
index 6a4017f..b7308a3 100644
--- a/colors/base16-gruvbox-light-hard.vim
+++ b/colors/base16-gruvbox-light-hard.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim
index 7508a74..89917bb 100644
--- a/colors/base16-gruvbox-light-medium.vim
+++ b/colors/base16-gruvbox-light-medium.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim
index fed2237..3af306a 100644
--- a/colors/base16-gruvbox-light-soft.vim
+++ b/colors/base16-gruvbox-light-soft.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-hardcore.vim b/colors/base16-hardcore.vim
index dd2f9ae..fe55527 100644
--- a/colors/base16-hardcore.vim
+++ b/colors/base16-hardcore.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim
index 7f73704..7aeef6c 100644
--- a/colors/base16-harmonic-dark.vim
+++ b/colors/base16-harmonic-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim
index 5493d76..ac8f375 100644
--- a/colors/base16-harmonic-light.vim
+++ b/colors/base16-harmonic-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-heetch-light.vim b/colors/base16-heetch-light.vim
index 2bef709..2adb00a 100644
--- a/colors/base16-heetch-light.vim
+++ b/colors/base16-heetch-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-heetch.vim b/colors/base16-heetch.vim
index aa1dca1..c50e270 100644
--- a/colors/base16-heetch.vim
+++ b/colors/base16-heetch.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-helios.vim b/colors/base16-helios.vim
index 154e0a6..e5ad735 100644
--- a/colors/base16-helios.vim
+++ b/colors/base16-helios.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim
index 73968b7..4b829cf 100644
--- a/colors/base16-hopscotch.vim
+++ b/colors/base16-hopscotch.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-horizon-dark.vim b/colors/base16-horizon-dark.vim
index cd932be..ded2549 100644
--- a/colors/base16-horizon-dark.vim
+++ b/colors/base16-horizon-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-horizon-light.vim b/colors/base16-horizon-light.vim
index 1f8af6f..9eb8c01 100644
--- a/colors/base16-horizon-light.vim
+++ b/colors/base16-horizon-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-horizon-terminal-dark.vim b/colors/base16-horizon-terminal-dark.vim
index e97a637..5374178 100644
--- a/colors/base16-horizon-terminal-dark.vim
+++ b/colors/base16-horizon-terminal-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-horizon-terminal-light.vim b/colors/base16-horizon-terminal-light.vim
index b3278c8..5d9f13e 100644
--- a/colors/base16-horizon-terminal-light.vim
+++ b/colors/base16-horizon-terminal-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-humanoid-dark.vim b/colors/base16-humanoid-dark.vim
index d868dee..b216bdc 100644
--- a/colors/base16-humanoid-dark.vim
+++ b/colors/base16-humanoid-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-humanoid-light.vim b/colors/base16-humanoid-light.vim
index 54a6b0c..b3960a0 100644
--- a/colors/base16-humanoid-light.vim
+++ b/colors/base16-humanoid-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-ia-dark.vim b/colors/base16-ia-dark.vim
index c9e2523..069883a 100644
--- a/colors/base16-ia-dark.vim
+++ b/colors/base16-ia-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-ia-light.vim b/colors/base16-ia-light.vim
index 03e7eb6..53620a0 100644
--- a/colors/base16-ia-light.vim
+++ b/colors/base16-ia-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim
index 87eaef9..69481bb 100644
--- a/colors/base16-icy.vim
+++ b/colors/base16-icy.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim
index 3c6a831..4731af4 100644
--- a/colors/base16-irblack.vim
+++ b/colors/base16-irblack.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index ee0930e..d594a96 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-kimber.vim b/colors/base16-kimber.vim
index fb47966..022bd0c 100644
--- a/colors/base16-kimber.vim
+++ b/colors/base16-kimber.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim
index 71d5ead..2653716 100644
--- a/colors/base16-macintosh.vim
+++ b/colors/base16-macintosh.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index 5459cec..076d23b 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim
index b255f62..dac108a 100644
--- a/colors/base16-materia.vim
+++ b/colors/base16-materia.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim
index d2c59a0..bd601d2 100644
--- a/colors/base16-material-darker.vim
+++ b/colors/base16-material-darker.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim
index 03d633c..14d01f9 100644
--- a/colors/base16-material-lighter.vim
+++ b/colors/base16-material-lighter.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim
index 51ed300..9e06594 100644
--- a/colors/base16-material-palenight.vim
+++ b/colors/base16-material-palenight.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-material-vivid.vim b/colors/base16-material-vivid.vim
index a307af1..c44f412 100644
--- a/colors/base16-material-vivid.vim
+++ b/colors/base16-material-vivid.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-material.vim b/colors/base16-material.vim
index 886b2aa..3e5a549 100644
--- a/colors/base16-material.vim
+++ b/colors/base16-material.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim
index b72b839..35842a4 100644
--- a/colors/base16-mellow-purple.vim
+++ b/colors/base16-mellow-purple.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim
index 31b5479..1973af6 100644
--- a/colors/base16-mexico-light.vim
+++ b/colors/base16-mexico-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 29abcf3..e61c749 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index b150343..bdba86f 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-nebula.vim b/colors/base16-nebula.vim
index c006abd..40b856d 100644
--- a/colors/base16-nebula.vim
+++ b/colors/base16-nebula.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim
index 03f1d6d..064f68a 100644
--- a/colors/base16-nord.vim
+++ b/colors/base16-nord.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-nova.vim b/colors/base16-nova.vim
index ec6fe5c..3920cb3 100644
--- a/colors/base16-nova.vim
+++ b/colors/base16-nova.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index c9f35b2..dcb817d 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim
index bfde74d..b293fe8 100644
--- a/colors/base16-oceanicnext.vim
+++ b/colors/base16-oceanicnext.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim
index 57f4a21..c736da4 100644
--- a/colors/base16-one-light.vim
+++ b/colors/base16-one-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim
index 39bc1af..a802eb9 100644
--- a/colors/base16-onedark.vim
+++ b/colors/base16-onedark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-outrun-dark.vim b/colors/base16-outrun-dark.vim
index 99865f8..deb7415 100644
--- a/colors/base16-outrun-dark.vim
+++ b/colors/base16-outrun-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-papercolor-dark.vim b/colors/base16-papercolor-dark.vim
index 260a0a4..b41e227 100644
--- a/colors/base16-papercolor-dark.vim
+++ b/colors/base16-papercolor-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-papercolor-light.vim b/colors/base16-papercolor-light.vim
index fbb9bde..d45d2f5 100644
--- a/colors/base16-papercolor-light.vim
+++ b/colors/base16-papercolor-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index 7735d1d..352341a 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-pasque.vim b/colors/base16-pasque.vim
index d77961f..7219260 100644
--- a/colors/base16-pasque.vim
+++ b/colors/base16-pasque.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim
index 7f12b83..abd9d1b 100644
--- a/colors/base16-phd.vim
+++ b/colors/base16-phd.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim
index 699db0f..a7cce94 100644
--- a/colors/base16-pico.vim
+++ b/colors/base16-pico.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-pinky.vim b/colors/base16-pinky.vim
index 777da7d..b4ef29e 100644
--- a/colors/base16-pinky.vim
+++ b/colors/base16-pinky.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim
index e90d150..6513be0 100644
--- a/colors/base16-pop.vim
+++ b/colors/base16-pop.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim
index 9d21090..0776faf 100644
--- a/colors/base16-porple.vim
+++ b/colors/base16-porple.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-qualia.vim b/colors/base16-qualia.vim
index 705a2a2..7e68eb3 100644
--- a/colors/base16-qualia.vim
+++ b/colors/base16-qualia.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 68f9ea1..9c2f8b8 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim
index 67a317c..be82314 100644
--- a/colors/base16-rebecca.vim
+++ b/colors/base16-rebecca.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-rose-pine-dawn.vim b/colors/base16-rose-pine-dawn.vim
index 6bd068c..1a13882 100644
--- a/colors/base16-rose-pine-dawn.vim
+++ b/colors/base16-rose-pine-dawn.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-rose-pine-moon.vim b/colors/base16-rose-pine-moon.vim
index 28811c9..89f1e49 100644
--- a/colors/base16-rose-pine-moon.vim
+++ b/colors/base16-rose-pine-moon.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-rose-pine.vim b/colors/base16-rose-pine.vim
index bdc35e6..4c2b735 100644
--- a/colors/base16-rose-pine.vim
+++ b/colors/base16-rose-pine.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-sagelight.vim b/colors/base16-sagelight.vim
index c843919..02283e6 100644
--- a/colors/base16-sagelight.vim
+++ b/colors/base16-sagelight.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-sakura.vim b/colors/base16-sakura.vim
index 6fd4dac..23b3b4f 100644
--- a/colors/base16-sakura.vim
+++ b/colors/base16-sakura.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-sandcastle.vim b/colors/base16-sandcastle.vim
index e7b325d..b94ffa2 100644
--- a/colors/base16-sandcastle.vim
+++ b/colors/base16-sandcastle.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim
index 6ca2f80..bc84d20 100644
--- a/colors/base16-seti.vim
+++ b/colors/base16-seti.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-shades-of-purple.vim b/colors/base16-shades-of-purple.vim
index 4e277a7..4c0a873 100644
--- a/colors/base16-shades-of-purple.vim
+++ b/colors/base16-shades-of-purple.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index 2c15a9a..a19ecce 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-silk-dark.vim b/colors/base16-silk-dark.vim
index fbde918..dddb15d 100644
--- a/colors/base16-silk-dark.vim
+++ b/colors/base16-silk-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-silk-light.vim b/colors/base16-silk-light.vim
index d178abc..d199168 100644
--- a/colors/base16-silk-light.vim
+++ b/colors/base16-silk-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-snazzy.vim b/colors/base16-snazzy.vim
index 6cdcc92..4e22294 100644
--- a/colors/base16-snazzy.vim
+++ b/colors/base16-snazzy.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-solarflare-light.vim b/colors/base16-solarflare-light.vim
index c375fe2..34d6987 100644
--- a/colors/base16-solarflare-light.vim
+++ b/colors/base16-solarflare-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim
index ada876d..0aafd2e 100644
--- a/colors/base16-solarflare.vim
+++ b/colors/base16-solarflare.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim
index 41ea647..298a05e 100644
--- a/colors/base16-solarized-dark.vim
+++ b/colors/base16-solarized-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim
index bb60ab5..aa7efaa 100644
--- a/colors/base16-solarized-light.vim
+++ b/colors/base16-solarized-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim
index 797a9c7..2443608 100644
--- a/colors/base16-spacemacs.vim
+++ b/colors/base16-spacemacs.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-summercamp.vim b/colors/base16-summercamp.vim
index b7b5c7c..c0829d6 100644
--- a/colors/base16-summercamp.vim
+++ b/colors/base16-summercamp.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim
index 9be413d..7ab6196 100644
--- a/colors/base16-summerfruit-dark.vim
+++ b/colors/base16-summerfruit-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim
index 0a84577..1ab0fb5 100644
--- a/colors/base16-summerfruit-light.vim
+++ b/colors/base16-summerfruit-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-synth-midnight-dark.vim b/colors/base16-synth-midnight-dark.vim
index 44d8f0d..d4903e0 100644
--- a/colors/base16-synth-midnight-dark.vim
+++ b/colors/base16-synth-midnight-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-synth-midnight-light.vim b/colors/base16-synth-midnight-light.vim
index fa4857f..ce74ea8 100644
--- a/colors/base16-synth-midnight-light.vim
+++ b/colors/base16-synth-midnight-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-tango.vim b/colors/base16-tango.vim
index adebcd8..44631dd 100644
--- a/colors/base16-tango.vim
+++ b/colors/base16-tango.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-tender.vim b/colors/base16-tender.vim
index 6412d3e..674de94 100644
--- a/colors/base16-tender.vim
+++ b/colors/base16-tender.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-tomorrow-night-eighties.vim b/colors/base16-tomorrow-night-eighties.vim
index 0d48da6..40f08f3 100644
--- a/colors/base16-tomorrow-night-eighties.vim
+++ b/colors/base16-tomorrow-night-eighties.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim
index 00cc62d..7fb5bec 100644
--- a/colors/base16-tomorrow-night.vim
+++ b/colors/base16-tomorrow-night.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 38e75df..6f17b84 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim
index 3ddd2bb..234047c 100644
--- a/colors/base16-tube.vim
+++ b/colors/base16-tube.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index 64132c0..994717c 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim
index 820a9b8..b47fbe5 100644
--- a/colors/base16-unikitty-dark.vim
+++ b/colors/base16-unikitty-dark.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim
index 5aef64b..3651228 100644
--- a/colors/base16-unikitty-light.vim
+++ b/colors/base16-unikitty-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-vulcan.vim b/colors/base16-vulcan.vim
index b6c4747..b7114ff 100644
--- a/colors/base16-vulcan.vim
+++ b/colors/base16-vulcan.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-windows-10-light.vim b/colors/base16-windows-10-light.vim
index 01e464a..d59ba1b 100644
--- a/colors/base16-windows-10-light.vim
+++ b/colors/base16-windows-10-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-windows-10.vim b/colors/base16-windows-10.vim
index 5c65fc7..b9ba3f5 100644
--- a/colors/base16-windows-10.vim
+++ b/colors/base16-windows-10.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-windows-95-light.vim b/colors/base16-windows-95-light.vim
index 9f343ab..f48f865 100644
--- a/colors/base16-windows-95-light.vim
+++ b/colors/base16-windows-95-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-windows-95.vim b/colors/base16-windows-95.vim
index 98afff4..9fa8d4d 100644
--- a/colors/base16-windows-95.vim
+++ b/colors/base16-windows-95.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-windows-highcontrast-light.vim b/colors/base16-windows-highcontrast-light.vim
index b35c8c9..e1cc8e0 100644
--- a/colors/base16-windows-highcontrast-light.vim
+++ b/colors/base16-windows-highcontrast-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-windows-highcontrast.vim b/colors/base16-windows-highcontrast.vim
index caedd42..0fa2c72 100644
--- a/colors/base16-windows-highcontrast.vim
+++ b/colors/base16-windows-highcontrast.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-windows-nt-light.vim b/colors/base16-windows-nt-light.vim
index 3bd54e6..cf865b5 100644
--- a/colors/base16-windows-nt-light.vim
+++ b/colors/base16-windows-nt-light.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-windows-nt.vim b/colors/base16-windows-nt.vim
index 5e9ac19..7b64833 100644
--- a/colors/base16-windows-nt.vim
+++ b/colors/base16-windows-nt.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim
index 7843539..a4163c0 100644
--- a/colors/base16-woodland.vim
+++ b/colors/base16-woodland.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim
index c1d53b8..814f5fb 100644
--- a/colors/base16-xcode-dusk.vim
+++ b/colors/base16-xcode-dusk.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim
index 74d4fed..2b6261a 100644
--- a/colors/base16-zenburn.vim
+++ b/colors/base16-zenburn.vim
@@ -198,8 +198,8 @@ 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:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "reverse", "")
+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, "", "")
@@ -285,15 +285,15 @@ call <sid>hi("WarningFloat", s:gui09, s:gui02, s:cterm09, s:cterm02, "", "")
call <sid>hi("InfoFloat", s:gui0D, s:gui02, s:cterm0D, s:cterm02, "", "")
call <sid>hi("HintFloat", s:gui0C, s:gui02, s:cterm0C, s:cterm02, "", "")
-call <sid>hi("ErrorHighlight", s:gui08, s:gui00, s:cterm08, s:cterm00, "underline,reverse", s:gui08)
-call <sid>hi("WarningHighlight", s:gui09, s:gui00, s:cterm09, s:cterm00, "underline,reverse", s:gui09)
-call <sid>hi("InfoHighlight", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "underline,reverse", s:gui0D)
-call <sid>hi("HintHighlight", s:gui0C, s:gui00, s:cterm0C, s:cterm00, "underline,reverse", s:gui0C)
+call <sid>hi("ErrorHighlight", "", "", s:cterm00, s:cterm08, "underline", s:gui08)
+call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
+call <sid>hi("InfoHighlight", "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
+call <sid>hi("HintHighlight", "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
-call <sid>hi("SpellBad", "", "", s:cterm08, s:cterm00, "undercurl,reverse", s:gui08)
-call <sid>hi("SpellLocal", "", "", s:cterm0C, s:cterm00, "undercurl,reverse", s:gui0C)
-call <sid>hi("SpellCap", "", "", s:cterm0D, s:cterm00, "undercurl,reverse", s:gui0D)
-call <sid>hi("SpellRare", "", "", s:cterm0E, s:cterm00, "undercurl,reverse", s:gui0E)
+call <sid>hi("SpellBad", "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
call <sid>hi("ReferenceText", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
call <sid>hi("ReferenceRead", s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")