diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim
index f1a0b39..189790a 100644
--- a/colors/solarized8_dark.vim
+++ b/colors/solarized8_dark.vim
@@ -88,9 +88,9 @@ hi! Pmenu ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gu
 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
 hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
-hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496 cterm=NONE gui=NONE
-hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496 cterm=NONE gui=NONE
-hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 guisp=#839496 cterm=NONE,reverse gui=NONE,reverse
+hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE
+hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE
+hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642
 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#93a1a1
 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642
diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim
index 4deb0db..f19d6f2 100644
--- a/colors/solarized8_dark_flat.vim
+++ b/colors/solarized8_dark_flat.vim
@@ -89,9 +89,9 @@ hi! Pmenu ctermfg=0 guifg=#073642 ctermbg=12 guibg=#839496 cterm=NONE,reverse gu
 hi! PmenuSel ctermfg=0 guifg=#073642 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
 hi! PmenuThumb ctermfg=10 guifg=#586e75 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
-hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496 cterm=NONE gui=NONE
-hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496 cterm=NONE gui=NONE
-hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 guisp=#839496 cterm=NONE,reverse gui=NONE,reverse
+hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE
+hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE
+hi! TabLineSel ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642
 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=8 guibg=#002b36 guisp=#93a1a1
 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642
diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim
index 9bb598a..8e75625 100644
--- a/colors/solarized8_dark_high.vim
+++ b/colors/solarized8_dark_high.vim
@@ -88,9 +88,9 @@ hi! Pmenu ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gu
 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
 hi! PmenuThumb ctermfg=14 guifg=#93a1a1 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
-hi! TabLine ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 guisp=#93a1a1 cterm=NONE gui=NONE
-hi! TabLineFill ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 guisp=#93a1a1 cterm=NONE gui=NONE
-hi! TabLineSel ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 guisp=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
+hi! TabLine ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE
+hi! TabLineFill ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE
+hi! TabLineSel ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
 hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642
 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#eee8d5
 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642
diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim
index 6c28c42..f5e307c 100644
--- a/colors/solarized8_dark_low.vim
+++ b/colors/solarized8_dark_low.vim
@@ -88,9 +88,9 @@ hi! Pmenu ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gu
 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
 hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
-hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496 cterm=NONE gui=NONE
-hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496 cterm=NONE gui=NONE
-hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 guisp=#839496 cterm=NONE,reverse gui=NONE,reverse
+hi! TabLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE
+hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE gui=NONE
+hi! TabLineSel ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642
 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#93a1a1
 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642
diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim
index fcf1d45..b449347 100644
--- a/colors/solarized8_light.vim
+++ b/colors/solarized8_light.vim
@@ -88,9 +88,9 @@ hi! Pmenu ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gu
 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
 hi! PmenuThumb ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83 cterm=NONE gui=NONE
-hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83 cterm=NONE gui=NONE
-hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 guisp=#657b83 cterm=NONE,reverse gui=NONE,reverse
+hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE
+hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE
+hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5
 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#586e75
 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5
diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim
index b7c60ca..7267178 100644
--- a/colors/solarized8_light_flat.vim
+++ b/colors/solarized8_light_flat.vim
@@ -89,9 +89,9 @@ hi! Pmenu ctermfg=7 guifg=#eee8d5 ctermbg=11 guibg=#657b83 cterm=NONE,reverse gu
 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
 hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83 cterm=NONE gui=NONE
-hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83 cterm=NONE gui=NONE
-hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 guisp=#657b83 cterm=NONE,reverse gui=NONE,reverse
+hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE
+hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE
+hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
 hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5
 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=15 guibg=#fdf6e3 guisp=#586e75
 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5
diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim
index 3de3a04..293de78 100644
--- a/colors/solarized8_light_high.vim
+++ b/colors/solarized8_light_high.vim
@@ -88,9 +88,9 @@ hi! Pmenu ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gu
 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
 hi! PmenuThumb ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! TabLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 guisp=#586e75 cterm=NONE gui=NONE
-hi! TabLineFill ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 guisp=#586e75 cterm=NONE gui=NONE
-hi! TabLineSel ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 guisp=#586e75 cterm=NONE,reverse gui=NONE,reverse
+hi! TabLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE
+hi! TabLineFill ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE
+hi! TabLineSel ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
 hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5
 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#073642
 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5
diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim
index eade329..576d4d6 100644
--- a/colors/solarized8_light_low.vim
+++ b/colors/solarized8_light_low.vim
@@ -88,9 +88,9 @@ hi! Pmenu ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gu
 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
 hi! PmenuThumb ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
-hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83 cterm=NONE gui=NONE
-hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83 cterm=NONE gui=NONE
-hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 guisp=#657b83 cterm=NONE,reverse gui=NONE,reverse
+hi! TabLine ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE
+hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE gui=NONE
+hi! TabLineSel ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5
 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#586e75
 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5
diff --git a/src/solarized8.vim b/src/solarized8.vim
index c392340..1163742 100644
--- a/src/solarized8.vim
+++ b/src/solarized8.vim
@@ -369,9 +369,17 @@ for s:solarized_background in ["dark", "light"]
       call s:put("hi! PmenuSbar"      .s:fg_base2  .s:bg_base0   .s:fmt_revbb)
       call s:put("hi! PmenuThumb"     .s:fg_base0  .s:bg_base03  .s:fmt_revbb)
     endif
-    call s:put("hi! TabLine"        .s:fg_base0  .s:bg_base02  .s:sp_base0 .s:fmt_none)
-    call s:put("hi! TabLineFill"    .s:fg_base0  .s:bg_base02  .s:sp_base0 .s:fmt_none)
-    call s:put("hi! TabLineSel"     .s:fg_base01 .s:bg_base2   .s:sp_base0  .s:fmt_revbbu)
+    call s:put("hi! TabLine"        .s:fg_base0  .s:bg_base02  .s:fmt_none)
+    call s:put("hi! TabLineFill"    .s:fg_base0  .s:bg_base02  .s:fmt_none)
+    if s:solarized_contrast == "flat"
+      if s:solarized_background == "dark"
+        call s:put("hi! TabLineSel"     .s:fg_base02 .s:bg_base2   .s:fmt_revbb)
+      else
+        call s:put("hi! TabLineSel"     .s:fg_base01 .s:bg_base03  .s:fmt_revbb)
+      endif
+    else
+      call s:put("hi! TabLineSel"     .s:fg_base01 .s:bg_base2 .s:fmt_revbb)
+    endif
     call s:put("hi! CursorColumn"   .s:fmt_none   .s:fg_none   .s:bg_base02)
     if s:solarized_contrast == "flat"
       call s:put("hi! CursorLine"   .s:fmt_uopt   .s:fg_none   .s:bg_base03  .s:sp_base1)