diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim
index f19d6f2..a5a3b1d 100644
--- a/colors/solarized8_dark_flat.vim
+++ b/colors/solarized8_dark_flat.vim
@@ -42,9 +42,11 @@ endif
 if get(g:, "solarized_statusline", "") == "low"
   hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
   hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
+  hi! TabLineSel ctermfg=0 guifg=#073642 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
 else
   hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
   hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! TabLineSel ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 endif
 hi! StatusLineNC ctermfg=0 guifg=#073642 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=10 guifg=#586e75 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
@@ -89,9 +91,8 @@ 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 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! TabLine ctermbg=0 guibg=#073642 ctermfg=10 guifg=#586e75 cterm=NONE gui=NONE
+  hi! TabLineFill ctermbg=0 guibg=#073642 ctermfg=10 guifg=#586e75 cterm=NONE gui=NONE
 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_light_flat.vim b/colors/solarized8_light_flat.vim
index 7267178..c574c9f 100644
--- a/colors/solarized8_light_flat.vim
+++ b/colors/solarized8_light_flat.vim
@@ -42,9 +42,11 @@ endif
 if get(g:, "solarized_statusline", "") == "low"
   hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
   hi! StatusLine ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
+  hi! TabLineSel ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse gui=NONE,reverse
 else
   hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
   hi! StatusLine ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
+  hi! TabLineSel ctermfg=7 guifg=#eee8d5 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 endif
 hi! StatusLineNC ctermfg=7 guifg=#eee8d5 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
@@ -89,9 +91,8 @@ 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 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! TabLine ctermbg=7 guibg=#eee8d5 ctermfg=14 guifg=#93a1a1 cterm=NONE gui=NONE
+  hi! TabLineFill ctermbg=7 guibg=#eee8d5 ctermfg=14 guifg=#93a1a1 cterm=NONE gui=NONE
 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/src/solarized8.vim b/src/solarized8.vim
index 1163742..c6a0e7e 100644
--- a/src/solarized8.vim
+++ b/src/solarized8.vim
@@ -264,21 +264,23 @@ for s:solarized_background in ["dark", "light"]
     if s:solarized_contrast == "flat"
       call s:put("  hi! NormalMode"     .s:fg_base02  .s:bg_base1 .s:fmt_revbb)
       call s:put("  hi! StatusLine"     .s:fg_base02  .s:bg_base1 .s:fmt_revbb)
-    else
+      call s:put("  hi! TabLineSel"     .s:fg_base02  .s:bg_base1 .s:fmt_revbb)
+    else " no flat
       if s:solarized_background == "dark"
         if s:solarized_contrast == "high"
           call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb)
         else
           call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=7 guibg=#eee8d5" .s:fmt_revbb)
         endif
-      else
+      else " light
         call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb)
       endif
     endif
-    call s:put('else')
+    call s:put('else') " solarized_statusline !=# 'low'
     if s:solarized_contrast == "flat"
       call s:put("  hi! NormalMode"     .s:fg_base02 .s:bg_base2 . s:fmt_revbb)
       call s:put("  hi! StatusLine"     .s:fg_base02 .s:bg_base2 .s:fmt_revbb)
+      call s:put("  hi! TabLineSel"     .s:fg_base02 .s:bg_base2 .s:fmt_revbb)
     else
       if s:solarized_background == "dark"
         " Changed by Lifepillar: slightly darker status line, light foreground
@@ -369,15 +371,13 @@ 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: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
+    if s:solarized_contrast ==# "flat"
+      call s:put("  hi! TabLine"        . s:bg_base02 . s:fg_base01 . s:fmt_none)
+      call s:put("  hi! TabLineFill"    . s:bg_base02 . s:fg_base01 . s:fmt_none)
+      " TabLineSel is set together with StatusLine (see below)
     else
+      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)
       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)