Fix error group highlighting under cursorline.

182 files changed, 1820 insertions, 1820 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 3ebd391..41402a1 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 2d09298..d5db330 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 10cdf36..225be86 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 bbc2262..f147e41 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 bd89992..72be8c5 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 d9a1e3c..9fe0379 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 6b9dd85..487f0ea 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 41b115b..a9692a3 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 982a543..6634df5 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 bf4a525..f668381 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 bf35005..92e1898 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 597cd58..c8d4894 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 58fec78..a3e7a1a 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 3d382a7..4500dce 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 344c42a..3dc6fc8 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 3f1d176..3b02105 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 646928f..5fee755 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 0885f84..3938e0e 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4bf9571..04c3aa8 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b193ade..713a93e 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 43bc658..bafeaa0 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 36c2929..a3bcf61 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 e6e6b92..fbe78c8 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7080440..ab41558 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 aa5c99e..5b4da0d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4801a76..c3f90f6 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 1a60853..2d22ad9 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 6b29522..6f208cf 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 8342c5d..45c94d0 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7a40086..02121a9 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 3844284..6ff0290 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 d842c1f..5a6709c 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 e4ad8bb..f821347 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 04155fe..ddf8384 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 2d3b32a..f402435 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 75b4950..f1c5dd7 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 1f75e59..4be6085 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 79c9170..aa2b308 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4a413a7..89fba23 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4712bc9..2292ccf 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7cec7e8..bb808ca 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 adb1c58..260710b 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a9706f6..0c63286 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 63f3931..20159b7 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9d6f121..4fe1293 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 076b813..b6183d4 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 cd1d9e4..fcb6dbd 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 fe4cddf..d383e8e 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9f1099a..3788214 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 98852fa..653a47c 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 646bf81..dfa8f00 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 458982e..2a9e1a2 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 1e5e78d..dc9e576 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 e9a835d..8eb8b9d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 c888ad9..57f659b 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 8e1ffe3..27cc188 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7423abc..390df5a 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a8e6863..421bfbe 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 3a45b48..72d6033 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 897b680..eddaa46 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 fffdb4b..f42957f 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a0d0c9e..e959226 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 ecd03c3..2a6dfe3 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 6e4eef6..ca3551a 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 46a5af0..50328cc 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 76a4924..cf52f44 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 51d4ef7..11c4228 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 38aa56f..1002f71 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7038314..1b0a66f 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9f4f9d2..5984e1d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9963ed4..ae4b521 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b76fac2..9eb71c7 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 f844052..d3f3f75 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a108d90..40264a0 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 46cab52..43e8944 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9b2f5cf..924bcd1 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 c6b7b47..364f212 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 8fd052c..fa38624 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a883576..15bc42b 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7ecf134..85f12ee 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 ae24afb..33efe30 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 986c0c2..8082894 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 d1e1a21..46d0cb6 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 55a887f..adef743 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b7308a3..6a4017f 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 89917bb..7508a74 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 3af306a..fed2237 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 fe55527..dd2f9ae 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7aeef6c..7f73704 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 ac8f375..5493d76 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 2adb00a..2bef709 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 c50e270..aa1dca1 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 e5ad735..154e0a6 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4b829cf..73968b7 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 ded2549..cd932be 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9eb8c01..1f8af6f 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 5374178..e97a637 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 5d9f13e..b3278c8 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b216bdc..d868dee 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b3960a0..54a6b0c 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 069883a..c9e2523 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 53620a0..03e7eb6 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 69481bb..87eaef9 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4731af4..3c6a831 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 d594a96..ee0930e 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 022bd0c..fb47966 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 2653716..71d5ead 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 076d23b..5459cec 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 dac108a..b255f62 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 bd601d2..d2c59a0 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 14d01f9..03d633c 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9e06594..51ed300 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 c44f412..a307af1 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 3e5a549..886b2aa 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 35842a4..b72b839 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 1973af6..31b5479 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 e61c749..29abcf3 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 bdba86f..b150343 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 40b856d..c006abd 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 064f68a..03f1d6d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 3920cb3..ec6fe5c 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 dcb817d..c9f35b2 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b293fe8..bfde74d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 c736da4..57f4a21 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a802eb9..39bc1af 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 deb7415..99865f8 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b41e227..260a0a4 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 d45d2f5..fbb9bde 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 352341a..7735d1d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7219260..d77961f 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 abd9d1b..7f12b83 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a7cce94..699db0f 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b4ef29e..777da7d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 6513be0..e90d150 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 0776faf..9d21090 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7e68eb3..705a2a2 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9c2f8b8..68f9ea1 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 be82314..67a317c 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 1a13882..6bd068c 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 89f1e49..28811c9 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4c2b735..bdc35e6 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 02283e6..c843919 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 23b3b4f..6fd4dac 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b94ffa2..e7b325d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 bc84d20..6ca2f80 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4c0a873..4e277a7 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a19ecce..2c15a9a 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 dddb15d..fbde918 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 d199168..d178abc 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 4e22294..6cdcc92 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 34d6987..c375fe2 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 0aafd2e..ada876d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 298a05e..41ea647 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 aa7efaa..bb60ab5 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 2443608..797a9c7 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 c0829d6..b7b5c7c 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7ab6196..9be413d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 1ab0fb5..0a84577 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 d4903e0..44d8f0d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 ce74ea8..fa4857f 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 44631dd..adebcd8 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 674de94..6412d3e 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 40f08f3..0d48da6 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7fb5bec..00cc62d 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 6f17b84..38e75df 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 234047c..3ddd2bb 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 994717c..64132c0 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b47fbe5..820a9b8 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 3651228..5aef64b 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b7114ff..b6c4747 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 d59ba1b..01e464a 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 b9ba3f5..5c65fc7 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 f48f865..9f343ab 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 9fa8d4d..98afff4 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 e1cc8e0..b35c8c9 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 0fa2c72..caedd42 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 cf865b5..3bd54e6 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 7b64833..5e9ac19 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 a4163c0..7843539 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 814f5fb..c1d53b8 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("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 2b6261a..74d4fed 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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")
diff --git a/templates/default.mustache b/templates/default.mustache
index d88aeba..3077360 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -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:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
-call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+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("Exception",     s:gui08, "", s:cterm08, "", "", "")
 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:cterm00, s:cterm08, "underline", s:gui08)
-call <sid>hi("WarningHighlight", "", "", s:cterm00, s:cterm09, "underline", s:gui09)
-call <sid>hi("InfoHighlight",    "", "", s:cterm00, s:cterm0D, "underline", s:gui0D)
-call <sid>hi("HintHighlight",    "", "", s:cterm00, s:cterm0C, "underline", s:gui0C)
+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("SpellBad",     "", "", s:cterm00, s:cterm08, "undercurl", s:gui08)
-call <sid>hi("SpellLocal",   "", "", s:cterm00, s:cterm0C, "undercurl", s:gui0C)
-call <sid>hi("SpellCap",     "", "", s:cterm00, s:cterm0D, "undercurl", s:gui0D)
-call <sid>hi("SpellRare",    "", "", s:cterm00, s:cterm0E, "undercurl", s:gui0E)
+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("ReferenceText",   s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "")
 call <sid>hi("ReferenceRead",   s:gui01, s:gui0B, s:cterm01, s:cterm0B, "", "")