diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim
index 8da8b8f..13f0d8b 100644
--- a/colors/solarized8_dark.vim
+++ b/colors/solarized8_dark.vim
@@ -112,10 +112,10 @@ else
 endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
-hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#d33682
-hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
-hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
-hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
+hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE guisp=#2aa198
+hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
 hi! Pmenu ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSbar ctermfg=7 guifg=#eee8d5 ctermbg=12 guibg=#839496 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim
index 50b5f7a..4e3ef60 100644
--- a/colors/solarized8_dark_flat.vim
+++ b/colors/solarized8_dark_flat.vim
@@ -110,10 +110,10 @@ else
 endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
-hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#d33682
-hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
-hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
-hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
+hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE guisp=#2aa198
+hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
 hi! Pmenu ctermfg=0 guifg=#073642 ctermbg=12 guibg=#839496 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSbar ctermfg=0 guifg=#073642 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim
index 197ed15..cca7a87 100644
--- a/colors/solarized8_dark_high.vim
+++ b/colors/solarized8_dark_high.vim
@@ -112,10 +112,10 @@ else
 endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
-hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#d33682
-hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
-hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
-hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
+hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=NONE guisp=#cb4b16
+hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=NONE guisp=#cb4b16
+hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE guisp=#2aa198
+hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
 hi! Pmenu ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSbar ctermfg=15 guifg=#fdf6e3 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim
index 86ece65..ed4f70d 100644
--- a/colors/solarized8_dark_low.vim
+++ b/colors/solarized8_dark_low.vim
@@ -112,10 +112,10 @@ else
 endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
-hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#d33682
-hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
-hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
-hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
+hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=13 guifg=#6c71c4 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE guisp=#2aa198
+hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
 hi! Pmenu ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSbar ctermfg=7 guifg=#eee8d5 ctermbg=12 guibg=#839496 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim
index 28841e9..4ff5828 100644
--- a/colors/solarized8_light.vim
+++ b/colors/solarized8_light.vim
@@ -124,10 +124,10 @@ else
 endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
-hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#dc322f
-hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
-hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
-hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
+hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE guisp=#2aa198
+hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
 hi! Pmenu ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSbar ctermfg=0 guifg=#073642 ctermbg=11 guibg=#657b83 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim
index 39d4f8b..01b4fb1 100644
--- a/colors/solarized8_light_flat.vim
+++ b/colors/solarized8_light_flat.vim
@@ -122,10 +122,10 @@ else
 endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
-hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#dc322f
-hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
-hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
-hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
+hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE guisp=#2aa198
+hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
 hi! Pmenu ctermfg=7 guifg=#eee8d5 ctermbg=11 guibg=#657b83 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSbar ctermfg=7 guifg=#eee8d5 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim
index e1501ed..d3d4c17 100644
--- a/colors/solarized8_light_high.vim
+++ b/colors/solarized8_light_high.vim
@@ -124,10 +124,10 @@ else
 endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
-hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#dc322f
-hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
-hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
-hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
+hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE guisp=#2aa198
+hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
 hi! Pmenu ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSbar ctermfg=8 guifg=#002b36 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim
index ea3160a..f1b34ba 100644
--- a/colors/solarized8_light_low.vim
+++ b/colors/solarized8_light_low.vim
@@ -124,10 +124,10 @@ else
 endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
-hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#dc322f
-hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#6c71c4
-hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#2aa198
-hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#b58900
+hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellCap cterm=NONE,undercurl gui=NONE,undercurl ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE guisp=#6c71c4
+hi! SpellRare cterm=NONE,undercurl gui=NONE,undercurl ctermfg=6 guifg=#2aa198 ctermbg=NONE guibg=NONE guisp=#2aa198
+hi! SpellLocal cterm=NONE,undercurl gui=NONE,undercurl ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
 hi! Pmenu ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 hi! PmenuSbar ctermfg=0 guifg=#073642 ctermbg=11 guibg=#657b83 cterm=NONE,reverse gui=NONE,reverse
diff --git a/src/solarized8.vim b/src/solarized8.vim
index 0427bf0..ccf8ffd 100644
--- a/src/solarized8.vim
+++ b/src/solarized8.vim
@@ -510,13 +510,21 @@ for s:solarized_background in ["dark", "light"]
     call s:put("hi! SignColumn"     .s:fmt_none   .s:fg_base0  .s:bg_none)
     call s:put("hi! Conceal"        .s:fmt_none   .s:fg_blue   .s:bg_none)
     if s:solarized_background == "dark"
-      call s:put("hi! SpellBad"       .s:fmt_curl   .s:fg_none   .s:bg_none    .s:sp_magenta)
+      if s:solarized_contrast == "high"
+        call s:put("hi! SpellBad"    .s:fmt_curl   .s:fg_violet  .s:bg_none .s:sp_orange)
+        call s:put("hi! SpellCap"    .s:fmt_curl   .s:fg_violet  .s:bg_none .s:sp_orange)
+      else
+        call s:put("hi! SpellBad"    .s:fmt_curl   .s:fg_violet  .s:bg_none .s:sp_violet)
+        call s:put("hi! SpellCap"    .s:fmt_curl   .s:fg_violet  .s:bg_none .s:sp_violet)
+      endif
+      call s:put("hi! SpellRare"     .s:fmt_curl   .s:fg_cyan    .s:bg_none .s:sp_cyan)
+      call s:put("hi! SpellLocal"    .s:fmt_curl   .s:fg_yellow  .s:bg_none .s:sp_yellow)
     else
-      call s:put("hi! SpellBad"       .s:fmt_curl   .s:fg_none   .s:bg_none    .s:sp_red)
+      call s:put("hi! SpellBad"      .s:fmt_curl   .s:fg_magenta .s:bg_none .s:sp_violet)
+      call s:put("hi! SpellCap"      .s:fmt_curl   .s:fg_magenta .s:bg_none .s:sp_violet)
+      call s:put("hi! SpellRare"     .s:fmt_curl   .s:fg_cyan    .s:bg_none .s:sp_cyan)
+      call s:put("hi! SpellLocal"    .s:fmt_curl   .s:fg_yellow  .s:bg_none .s:sp_yellow)
     endif
-    call s:put("hi! SpellCap"       .s:fmt_curl   .s:fg_none   .s:bg_none    .s:sp_violet)
-    call s:put("hi! SpellRare"      .s:fmt_curl   .s:fg_none   .s:bg_none    .s:sp_cyan)
-    call s:put("hi! SpellLocal"     .s:fmt_curl   .s:fg_none   .s:bg_none    .s:sp_yellow)
     if s:solarized_contrast == "flat"
       if s:solarized_background == "dark"
         call s:put("hi! Pmenu"          .s:fg_base02 .s:bg_base0   .s:fmt_revbb)