diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim
index ad1e07b..177f045 100644
--- a/colors/solarized8_dark.vim
+++ b/colors/solarized8_dark.vim
@@ -88,8 +88,8 @@ 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
-hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496
+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! 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
diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim
index a3412f2..adc1634 100644
--- a/colors/solarized8_dark_flat.vim
+++ b/colors/solarized8_dark_flat.vim
@@ -88,8 +88,8 @@ 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
-hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496
+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! 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
diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim
index 6ff9c4e..d172746 100644
--- a/colors/solarized8_dark_high.vim
+++ b/colors/solarized8_dark_high.vim
@@ -88,8 +88,8 @@ 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
-hi! TabLineFill ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 guisp=#93a1a1
+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! 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
diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim
index aadd6ca..aa89dbc 100644
--- a/colors/solarized8_dark_low.vim
+++ b/colors/solarized8_dark_low.vim
@@ -88,8 +88,8 @@ 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
-hi! TabLineFill ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 guisp=#839496
+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! 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
diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim
index 7f54938..3dd05a5 100644
--- a/colors/solarized8_light.vim
+++ b/colors/solarized8_light.vim
@@ -88,8 +88,8 @@ 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
-hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83
+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! 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
diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim
index b2b625a..5d9e07a 100644
--- a/colors/solarized8_light_flat.vim
+++ b/colors/solarized8_light_flat.vim
@@ -88,8 +88,8 @@ 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
-hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83
+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! 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
diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim
index 5af8f0e..6197e66 100644
--- a/colors/solarized8_light_high.vim
+++ b/colors/solarized8_light_high.vim
@@ -88,8 +88,8 @@ 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
-hi! TabLineFill ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 guisp=#586e75
+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! 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
diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim
index 6bf61f6..ef21b41 100644
--- a/colors/solarized8_light_low.vim
+++ b/colors/solarized8_light_low.vim
@@ -88,8 +88,8 @@ 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
-hi! TabLineFill ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 guisp=#657b83
+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! 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
diff --git a/src/solarized8.vim b/src/solarized8.vim
index 2e1d3d0..a395b16 100644
--- a/src/solarized8.vim
+++ b/src/solarized8.vim
@@ -326,8 +326,8 @@ call s:put("hi! Pmenu"          .s:fg_base0  .s:bg_base02  .s:fmt_revbb)
 call s:put("hi! PmenuSel"       .s:fg_base01 .s:bg_base2   .s:fmt_revbb)
 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)
-call s:put("hi! TabLine"        .s:fg_base0  .s:bg_base02  .s:sp_base0)
-call s:put("hi! TabLineFill"    .s:fg_base0  .s:bg_base02  .s:sp_base0)
+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! CursorColumn"   .s:fmt_none   .s:fg_none   .s:bg_base02)
 if g:solarized_contrast == "flat"