diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim
index 3a9ce14..95bd6e3 100644
--- a/colors/solarized8_dark.vim
+++ b/colors/solarized8_dark.vim
@@ -45,10 +45,11 @@ else
 endif
 if get(g:, "solarized_statusline", "") == "low"
   hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
 else
   hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 endif
-hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=10 guifg=#586e75 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
 hi! Directory cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! ErrorMsg cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=15 guibg=#fdf6e3
diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim
index b3501bf..2b1edfd 100644
--- a/colors/solarized8_dark_high.vim
+++ b/colors/solarized8_dark_high.vim
@@ -45,10 +45,11 @@ else
 endif
 if get(g:, "solarized_statusline", "") == "low"
   hi! StatusLine ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 else
   hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=11 guifg=#657b83 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 endif
-hi! StatusLineNC ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=11 guifg=#657b83 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
 hi! Directory cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! ErrorMsg cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=15 guibg=#fdf6e3
diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim
index 13cdca1..fe19a6f 100644
--- a/colors/solarized8_dark_low.vim
+++ b/colors/solarized8_dark_low.vim
@@ -45,10 +45,11 @@ else
 endif
 if get(g:, "solarized_statusline", "") == "low"
   hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
 else
   hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=0 guibg=#073642 cterm=NONE,reverse gui=NONE,reverse
 endif
-hi! StatusLineNC ctermfg=10 guifg=#586e75 ctermbg=14 guibg=#93a1a1 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=10 guifg=#586e75 ctermbg=8 guibg=#002b36 cterm=NONE,reverse gui=NONE,reverse
 hi! Directory cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! ErrorMsg cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=15 guibg=#fdf6e3
diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim
index b2c923f..9604f0e 100644
--- a/colors/solarized8_light.vim
+++ b/colors/solarized8_light.vim
@@ -45,10 +45,11 @@ else
 endif
 if get(g:, "solarized_statusline", "") == "low"
   hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 else
   hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 endif
-hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
 hi! Directory cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! ErrorMsg cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=15 guibg=#fdf6e3
diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim
index d80940a..6c802a5 100644
--- a/colors/solarized8_light_high.vim
+++ b/colors/solarized8_light_high.vim
@@ -45,10 +45,11 @@ else
 endif
 if get(g:, "solarized_statusline", "") == "low"
   hi! StatusLine ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 else
   hi! StatusLine ctermfg=0 guifg=#073642 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 endif
-hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
 hi! Directory cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! ErrorMsg cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=15 guibg=#fdf6e3
diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim
index 5e0371a..a87cba6 100644
--- a/colors/solarized8_light_low.vim
+++ b/colors/solarized8_light_low.vim
@@ -45,10 +45,11 @@ else
 endif
 if get(g:, "solarized_statusline", "") == "low"
   hi! StatusLine ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 else
   hi! StatusLine ctermfg=10 guifg=#586e75 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
+  hi! StatusLineNC ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 endif
-hi! StatusLineNC ctermfg=14 guifg=#93a1a1 ctermbg=7 guibg=#eee8d5 cterm=NONE,reverse gui=NONE,reverse
 hi! Visual ctermfg=14 guifg=#93a1a1 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse
 hi! Directory cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! ErrorMsg cterm=NONE,reverse gui=NONE,reverse ctermfg=1 guifg=#dc322f ctermbg=15 guibg=#fdf6e3
diff --git a/src/solarized8.vim b/src/solarized8.vim
index d598026..4e88190 100644
--- a/src/solarized8.vim
+++ b/src/solarized8.vim
@@ -289,33 +289,29 @@ for s:solarized_background in ["dark", "light"]
         else
           call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=7 guibg=#eee8d5" .s:fmt_revbb)
         endif
+        call s:put("  hi! StatusLineNC" .s:fg_base01 .s:bg_base1  .s:fmt_revbb)
       else " light
         call s:put("  hi! StatusLine"     .s:fg_base01 ." ctermbg=15 guibg=#fdf6e3" .s:fmt_revbb)
+        call s:put("  hi! StatusLineNC" .s:fg_base01 .s:bg_base02  .s:fmt_revbb)
       endif
     endif
     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! 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_base2  .s:bg_base02 .s:fmt_none)
-    else
+    else " no low, no flat
       if s:solarized_background == "dark"
-        " Changed by Lifepillar: slightly darker status line, light foreground
-        call s:put("  hi! StatusLine"     .s:fg_base0  .s:bg_base02.s:fmt_revbb)
+        call s:put("  hi! StatusLine"     .s:fg_base0  .s:bg_base02 .s:fmt_revbb)
+        call s:put("  hi! StatusLineNC"   .s:fg_base01 .s:bg_base02 .s:fmt_revbb)
       else
-        call s:put("  hi! StatusLine"     .s:fg_base1 .s:bg_base02.s:fmt_revbb)
+        call s:put("  hi! StatusLine"     .s:fg_base1  .s:bg_base02 .s:fmt_revbb)
+        call s:put("  hi! StatusLineNC"   .s:fg_base00 .s:bg_base02 .s:fmt_revbb)
       endif
     endif
     call s:put('endif')
     if s:solarized_contrast == "flat"
-      call s:put("hi! StatusLineNC" . s:fg_base02 . s:bg_base01 . s:fmt_revbb)
-    else
-      " Changed by Lifepillar: lighter colors for disabled status line
-      if s:solarized_background == "dark"
-        call s:put("hi! StatusLineNC" .s:fg_base01 .s:bg_base1  .s:fmt_revbb)
-      else
-        call s:put("hi! StatusLineNC" .s:fg_base01 .s:bg_base02  .s:fmt_revbb)
-      endif
+      call s:put("hi! StatusLineNC"   .s:fg_base02 .s:bg_base01 .s:fmt_revbb)
     endif
     call s:put("hi! Visual"         .s:fg_base01 .s:bg_base03 .s:fmt_revbb)
     call s:put("hi! Directory"      .s:fmt_none   .s:fg_blue   .s:bg_none)