diff --git a/colors/solarized8.vim b/colors/solarized8.vim
index 9ea0f99..add22f1 100644
--- a/colors/solarized8.vim
+++ b/colors/solarized8.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " URL:          https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Change:  2025 May 28
+" Last Change:  2025 May 29
 
 " Generated by Colortemplate v3.0.0-beta3
 
@@ -729,14 +729,74 @@ if &background == 'dark'
   endif
 
   if str2nr(&t_Co) >= 16
+    hi Normal ctermfg=14 ctermbg=8 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=10 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=4 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=12 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=0 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=0 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
     hi Folded ctermfg=12 ctermbg=0 ctermul=NONE cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=11 ctermbg=0 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=15 ctermbg=0 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=12 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=14 ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=10 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=7 ctermbg=11 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=12 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=11 ctermbg=0 ctermul=NONE cterm=bold
     hi SpellBad ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellCap ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellRare ctermfg=6 ctermbg=NONE ctermul=NONE cterm=underline
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=12 ctermbg=0 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=12 ctermbg=0 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=8 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=0 ctermbg=10 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=10 ctermbg=8 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=0 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=7 ctermbg=0 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -1039,9 +1099,74 @@ if &background == 'dark'
   endif
 
   if str2nr(&t_Co) >= 8
+    hi Normal ctermfg=14 ctermbg=8 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=10 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=4 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=12 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=0 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=0 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Folded ctermfg=12 ctermbg=0 ctermul=8 cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=11 ctermbg=0 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=15 ctermbg=0 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=12 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=14 ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=10 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=7 ctermbg=11 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=12 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=11 ctermbg=0 ctermul=NONE cterm=bold
+    hi SpellBad ctermfg=13 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellCap ctermfg=13 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl
+    hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=12 ctermbg=0 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=12 ctermbg=0 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=8 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=0 ctermbg=10 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=10 ctermbg=8 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=0 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=7 ctermbg=0 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -1879,14 +2004,74 @@ if &background == 'light'
   endif
 
   if str2nr(&t_Co) >= 16
+    hi Normal ctermfg=10 ctermbg=15 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=14 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=9 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=11 ctermbg=7 ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=7 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=7 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
     hi Folded ctermfg=11 ctermbg=7 ctermul=NONE cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=12 ctermbg=7 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=10 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=10 ctermbg=7 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=7 ctermbg=12 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=11 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=12 ctermbg=7 ctermul=NONE cterm=bold
     hi SpellBad ctermfg=5 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellCap ctermfg=5 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellRare ctermfg=6 ctermbg=NONE ctermul=NONE cterm=underline
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=10 ctermbg=7 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=10 ctermbg=7 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=15 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=10 ctermbg=14 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=7 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -2201,6 +2386,74 @@ if &background == 'light'
   endif
 
   if str2nr(&t_Co) >= 8
+    hi Normal ctermfg=10 ctermbg=15 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=14 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=9 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=11 ctermbg=7 ctermul=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=7 ctermul=2 cterm=NONE
+    hi DiffChange ctermfg=3 ctermbg=7 ctermul=3 cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold
+    hi DiffText ctermfg=4 ctermbg=7 ctermul=4 cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Folded ctermfg=11 ctermbg=7 ctermul=15 cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=12 ctermbg=7 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=10 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=10 ctermbg=7 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=7 ctermbg=12 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=11 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=12 ctermbg=7 ctermul=NONE cterm=bold
+    hi SpellBad ctermfg=5 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellCap ctermfg=5 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl
+    hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=10 ctermbg=7 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=10 ctermbg=7 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=15 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=10 ctermbg=14 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=7 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim
index 2dfea4e..1a621ff 100644
--- a/colors/solarized8_flat.vim
+++ b/colors/solarized8_flat.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " URL:          https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Change:  2025 May 28
+" Last Change:  2025 May 29
 
 " Generated by Colortemplate v3.0.0-beta3
 
@@ -682,14 +682,74 @@ if &background == 'dark'
   endif
 
   if str2nr(&t_Co) >= 16
+    hi Normal ctermfg=12 ctermbg=8 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=0 ctermbg=5 ctermul=NONE cterm=bold,reverse
+    hi Comment ctermfg=10 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=4 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=0 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=0 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=12 ctermbg=NONE ctermul=NONE cterm=NONE
     hi Folded ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=0 ctermbg=6 ctermul=NONE cterm=bold,reverse
+    hi LineNr ctermfg=10 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=15 ctermbg=0 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=7 ctermbg=10 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=10 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=0 ctermbg=9 ctermul=NONE cterm=bold,reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=12 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=11 ctermbg=0 ctermul=NONE cterm=bold
     hi SpellBad ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellCap ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellRare ctermfg=6 ctermbg=NONE ctermul=NONE cterm=underline
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=0 ctermbg=14 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=10 ctermbg=0 ctermul=NONE cterm=NONE
+    hi TabLineFill ctermfg=10 ctermbg=0 ctermul=NONE cterm=NONE
+    hi TabLineSel ctermfg=7 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Terminal ctermfg=fg ctermbg=8 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=10 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=10 ctermbg=8 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=0 ctermbg=5 ctermul=NONE cterm=bold,reverse
+    hi VisualNOS ctermfg=NONE ctermbg=0 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=11 ctermbg=7 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -968,6 +1028,74 @@ if &background == 'dark'
   endif
 
   if str2nr(&t_Co) >= 8
+    hi Normal ctermfg=12 ctermbg=8 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=0 ctermbg=5 ctermul=NONE cterm=bold,reverse
+    hi Comment ctermfg=10 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=4 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=0 ctermul=2 cterm=NONE
+    hi DiffChange ctermfg=3 ctermbg=0 ctermul=3 cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=0 ctermul=NONE cterm=bold
+    hi DiffText ctermfg=4 ctermbg=0 ctermul=4 cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=12 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Folded ctermfg=12 ctermbg=NONE ctermul=8 cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=0 ctermbg=6 ctermul=NONE cterm=bold,reverse
+    hi LineNr ctermfg=10 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=15 ctermbg=0 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=7 ctermbg=10 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=10 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=0 ctermbg=9 ctermul=NONE cterm=bold,reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=12 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=11 ctermbg=0 ctermul=NONE cterm=bold
+    hi SpellBad ctermfg=13 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellCap ctermfg=13 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl
+    hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=0 ctermbg=14 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=10 ctermbg=0 ctermul=NONE cterm=NONE
+    hi TabLineFill ctermfg=10 ctermbg=0 ctermul=NONE cterm=NONE
+    hi TabLineSel ctermfg=7 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Terminal ctermfg=fg ctermbg=8 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=10 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=10 ctermbg=8 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=0 ctermbg=5 ctermul=NONE cterm=bold,reverse
+    hi VisualNOS ctermfg=NONE ctermbg=0 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=11 ctermbg=7 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -1738,14 +1866,74 @@ if &background == 'light'
   endif
 
   if str2nr(&t_Co) >= 16
+    hi Normal ctermfg=11 ctermbg=15 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=7 ctermbg=5 ctermul=NONE cterm=bold,reverse
+    hi Comment ctermfg=14 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=9 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=7 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=7 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=11 ctermbg=NONE ctermul=NONE cterm=NONE
     hi Folded ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=7 ctermbg=6 ctermul=NONE cterm=bold,reverse
+    hi LineNr ctermfg=14 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=8 ctermbg=7 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=7 ctermbg=0 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=15 ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=14 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=7 ctermbg=9 ctermul=NONE cterm=bold,reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=11 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=12 ctermbg=7 ctermul=NONE cterm=bold
     hi SpellBad ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellCap ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellRare ctermfg=6 ctermbg=NONE ctermul=NONE cterm=underline
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=7 ctermbg=0 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=7 ctermbg=10 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi TabLineFill ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi TabLineSel ctermfg=0 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Terminal ctermfg=fg ctermbg=15 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=7 ctermbg=5 ctermul=NONE cterm=bold,reverse
+    hi VisualNOS ctermfg=NONE ctermbg=7 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -2037,6 +2225,74 @@ if &background == 'light'
   endif
 
   if str2nr(&t_Co) >= 8
+    hi Normal ctermfg=11 ctermbg=15 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=7 ctermbg=5 ctermul=NONE cterm=bold,reverse
+    hi Comment ctermfg=14 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=9 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=7 ctermul=2 cterm=NONE
+    hi DiffChange ctermfg=3 ctermbg=7 ctermul=3 cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold
+    hi DiffText ctermfg=4 ctermbg=7 ctermul=4 cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=11 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Folded ctermfg=11 ctermbg=NONE ctermul=15 cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=7 ctermbg=6 ctermul=NONE cterm=bold,reverse
+    hi LineNr ctermfg=14 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=8 ctermbg=7 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=7 ctermbg=0 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=15 ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=14 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=7 ctermbg=9 ctermul=NONE cterm=bold,reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=11 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=12 ctermbg=7 ctermul=NONE cterm=bold
+    hi SpellBad ctermfg=13 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellCap ctermfg=13 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl
+    hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=7 ctermbg=0 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=7 ctermbg=10 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi TabLineFill ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi TabLineSel ctermfg=0 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Terminal ctermfg=fg ctermbg=15 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=7 ctermbg=5 ctermul=NONE cterm=bold,reverse
+    hi VisualNOS ctermfg=NONE ctermbg=7 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
diff --git a/colors/solarized8_high.vim b/colors/solarized8_high.vim
index 0603313..754ed46 100644
--- a/colors/solarized8_high.vim
+++ b/colors/solarized8_high.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " URL:          https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Change:  2025 May 28
+" Last Change:  2025 May 29
 
 " Generated by Colortemplate v3.0.0-beta3
 
@@ -720,14 +720,74 @@ if &background == 'dark'
   endif
 
   if str2nr(&t_Co) >= 16
+    hi Normal ctermfg=7 ctermbg=8 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=12 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=4 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=0 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=0 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=14 ctermbg=0 ctermul=NONE cterm=NONE
     hi Folded ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=11 ctermbg=0 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=15 ctermbg=0 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=7 ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=15 ctermbg=11 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=11 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=14 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=12 ctermbg=0 ctermul=NONE cterm=bold
     hi SpellBad ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellCap ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellRare ctermfg=6 ctermbg=NONE ctermul=NONE cterm=underline
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=14 ctermbg=0 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=11 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=11 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=11 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=14 ctermbg=0 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=8 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=7 ctermbg=0 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=0 ctermbg=11 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=11 ctermbg=8 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=0 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=15 ctermbg=0 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -1025,6 +1085,74 @@ if &background == 'dark'
   endif
 
   if str2nr(&t_Co) >= 8
+    hi Normal ctermfg=7 ctermbg=8 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=12 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=4 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=0 ctermul=2 cterm=NONE
+    hi DiffChange ctermfg=3 ctermbg=0 ctermul=3 cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=0 ctermul=NONE cterm=bold
+    hi DiffText ctermfg=4 ctermbg=0 ctermul=4 cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=14 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Folded ctermfg=14 ctermbg=0 ctermul=8 cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=11 ctermbg=0 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=15 ctermbg=0 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=7 ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=15 ctermbg=11 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=11 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=14 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=12 ctermbg=0 ctermul=NONE cterm=bold
+    hi SpellBad ctermfg=13 ctermbg=NONE ctermul=9 cterm=undercurl
+    hi SpellCap ctermfg=13 ctermbg=NONE ctermul=9 cterm=undercurl
+    hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl
+    hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=14 ctermbg=0 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=11 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=11 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=11 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=14 ctermbg=0 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=8 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=7 ctermbg=0 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=0 ctermbg=11 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=11 ctermbg=8 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=0 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=15 ctermbg=0 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -1834,14 +1962,74 @@ if &background == 'light'
   endif
 
   if str2nr(&t_Co) >= 16
+    hi Normal ctermfg=0 ctermbg=15 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=11 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=9 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=7 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=7 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=10 ctermbg=7 ctermul=NONE cterm=NONE
     hi Folded ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=0 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=0 ctermbg=7 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=8 ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=11 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=10 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=11 ctermbg=7 ctermul=NONE cterm=bold
     hi SpellBad ctermfg=5 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellCap ctermfg=5 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellRare ctermfg=6 ctermbg=NONE ctermul=NONE cterm=underline
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=11 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=11 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=11 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=15 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=0 ctermbg=7 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=0 ctermbg=14 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=7 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=11 ctermbg=15 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -2147,6 +2335,74 @@ if &background == 'light'
   endif
 
   if str2nr(&t_Co) >= 8
+    hi Normal ctermfg=0 ctermbg=15 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=11 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=9 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi CursorLineNr ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=7 ctermul=2 cterm=NONE
+    hi DiffChange ctermfg=3 ctermbg=7 ctermul=3 cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold
+    hi DiffText ctermfg=4 ctermbg=7 ctermul=4 cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=10 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Folded ctermfg=10 ctermbg=7 ctermul=15 cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=0 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=0 ctermbg=7 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=8 ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=11 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=10 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=11 ctermbg=7 ctermul=NONE cterm=bold
+    hi SpellBad ctermfg=5 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellCap ctermfg=5 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl
+    hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=11 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=11 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=11 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=0 ctermbg=7 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=15 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=0 ctermbg=7 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=0 ctermbg=14 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=7 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=11 ctermbg=15 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim
index 4801d0f..28a6ad3 100644
--- a/colors/solarized8_low.vim
+++ b/colors/solarized8_low.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " URL:          https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Change:  2025 May 28
+" Last Change:  2025 May 29
 
 " Generated by Colortemplate v3.0.0-beta3
 
@@ -712,15 +712,74 @@ if &background == 'dark'
   endif
 
   if str2nr(&t_Co) >= 16
+    hi Normal ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=10 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=10 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=4 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=10 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=underline
+    hi CursorLineNr ctermfg=12 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=0 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=0 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=0 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
     hi Folded ctermfg=12 ctermbg=0 ctermul=NONE cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=10 ctermbg=0 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=15 ctermbg=0 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=12 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=11 ctermbg=8 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=8 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=11 ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=8 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=12 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=11 ctermbg=0 ctermul=NONE cterm=bold
     hi SpellBad ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellCap ctermfg=13 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellRare ctermfg=6 ctermbg=NONE ctermul=NONE cterm=underline
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=12 ctermbg=0 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=12 ctermbg=0 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=0 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=14 ctermbg=10 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=10 ctermbg=8 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=0 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=7 ctermbg=0 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -1015,6 +1074,74 @@ if &background == 'dark'
   endif
 
   if str2nr(&t_Co) >= 8
+    hi Normal ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=10 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=10 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=4 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=10 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE ctermul=14 cterm=underline
+    hi CursorLineNr ctermfg=12 ctermbg=0 ctermul=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=0 ctermul=2 cterm=NONE
+    hi DiffChange ctermfg=3 ctermbg=0 ctermul=3 cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=0 ctermul=NONE cterm=bold
+    hi DiffText ctermfg=4 ctermbg=0 ctermul=4 cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=12 ctermbg=0 ctermul=NONE cterm=NONE
+    hi Folded ctermfg=12 ctermbg=0 ctermul=8 cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=10 ctermbg=0 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=15 ctermbg=0 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=11 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=12 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=11 ctermbg=8 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=8 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=11 ctermbg=0 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=8 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=12 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=11 ctermbg=0 ctermul=NONE cterm=bold
+    hi SpellBad ctermfg=13 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellCap ctermfg=13 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl
+    hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=12 ctermbg=0 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=10 ctermbg=0 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=12 ctermbg=0 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=0 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=14 ctermbg=0 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=0 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=14 ctermbg=10 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=10 ctermbg=8 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=0 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=7 ctermbg=0 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -1831,15 +1958,74 @@ if &background == 'light'
   endif
 
   if str2nr(&t_Co) >= 16
+    hi Normal ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=7 ctermbg=14 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=14 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=9 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=7 ctermbg=14 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=underline
+    hi CursorLineNr ctermfg=11 ctermbg=7 ctermul=NONE cterm=bold
     hi DiffAdd ctermfg=2 ctermbg=7 ctermul=NONE cterm=NONE
     hi DiffChange ctermfg=3 ctermbg=7 ctermul=NONE cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold
     hi DiffText ctermfg=4 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
     hi Folded ctermfg=11 ctermbg=7 ctermul=NONE cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=8 ctermbg=7 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=10 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=15 ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=11 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=15 ctermbg=12 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=12 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=11 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=12 ctermbg=7 ctermul=NONE cterm=bold
     hi SpellBad ctermfg=5 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellCap ctermfg=5 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=NONE cterm=underline
     hi SpellRare ctermfg=6 ctermbg=NONE ctermul=NONE cterm=underline
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=10 ctermbg=7 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=10 ctermbg=7 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=7 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=10 ctermbg=14 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=7 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
@@ -2150,6 +2336,74 @@ if &background == 'light'
   endif
 
   if str2nr(&t_Co) >= 8
+    hi Normal ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Added ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Changed ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ColorColumn ctermfg=7 ctermbg=14 ctermul=NONE cterm=NONE
+    hi CommandMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Comment ctermfg=14 ctermbg=NONE ctermul=NONE cterm=italic
+    hi Conceal ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Constant ctermfg=6 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Cursor ctermfg=15 ctermbg=9 ctermul=NONE cterm=NONE
+    hi CursorColumn ctermfg=7 ctermbg=14 ctermul=NONE cterm=NONE
+    hi CursorIM ctermfg=NONE ctermbg=fg ctermul=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE ctermul=12 cterm=underline
+    hi CursorLineNr ctermfg=11 ctermbg=7 ctermul=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=7 ctermul=2 cterm=NONE
+    hi DiffChange ctermfg=3 ctermbg=7 ctermul=3 cterm=NONE
+    hi DiffDelete ctermfg=1 ctermbg=7 ctermul=NONE cterm=bold
+    hi DiffText ctermfg=4 ctermbg=7 ctermul=4 cterm=NONE
+    hi Directory ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Error ctermfg=1 ctermbg=15 ctermul=NONE cterm=bold,reverse
+    hi ErrorMsg ctermfg=1 ctermbg=15 ctermul=NONE cterm=reverse
+    hi FoldColumn ctermfg=11 ctermbg=7 ctermul=NONE cterm=NONE
+    hi Folded ctermfg=11 ctermbg=7 ctermul=15 cterm=bold
+    hi Identifier ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE ctermul=NONE cterm=NONE
+    hi IncSearch ctermfg=9 ctermbg=NONE ctermul=NONE cterm=standout
+    hi InsertMode ctermfg=6 ctermbg=15 ctermul=NONE cterm=reverse
+    hi LineNr ctermfg=14 ctermbg=7 ctermul=NONE cterm=NONE
+    hi MatchParen ctermfg=8 ctermbg=7 ctermul=NONE cterm=bold
+    hi ModeMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi MoreMsg ctermfg=4 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi NonText ctermfg=12 ctermbg=NONE ctermul=NONE cterm=bold
+    hi NormalMode ctermfg=10 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Pmenu ctermfg=15 ctermbg=14 ctermul=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=11 ctermul=NONE cterm=NONE
+    hi PmenuSel ctermfg=15 ctermbg=12 ctermul=NONE cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=12 ctermul=NONE cterm=NONE
+    hi PreProc ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Question ctermfg=6 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Removed ctermfg=1 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi ReplaceMode ctermfg=9 ctermbg=15 ctermul=NONE cterm=reverse
+    hi Search ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
+    hi SignColumn ctermfg=11 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Special ctermfg=9 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi SpecialKey ctermfg=12 ctermbg=7 ctermul=NONE cterm=bold
+    hi SpellBad ctermfg=5 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellCap ctermfg=5 ctermbg=NONE ctermul=13 cterm=undercurl
+    hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl
+    hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl
+    hi Statement ctermfg=2 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi StatusLine ctermfg=10 ctermbg=7 ctermul=NONE cterm=reverse
+    hi StatusLineNC ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLine ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineFill ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
+    hi TabLineSel ctermfg=10 ctermbg=7 ctermul=NONE cterm=reverse
+    hi Terminal ctermfg=fg ctermbg=7 ctermul=NONE cterm=NONE
+    hi Title ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi Todo ctermfg=5 ctermbg=NONE ctermul=NONE cterm=bold
+    hi ToolbarButton ctermfg=10 ctermbg=7 ctermul=NONE cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=7 ctermul=NONE cterm=NONE
+    hi Type ctermfg=3 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi Underlined ctermfg=13 ctermbg=NONE ctermul=NONE cterm=NONE
+    hi VertSplit ctermfg=10 ctermbg=14 ctermul=NONE cterm=NONE
+    hi Visual ctermfg=14 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualMode ctermfg=5 ctermbg=15 ctermul=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=7 ctermul=NONE cterm=reverse
+    hi WarningMsg ctermfg=9 ctermbg=NONE ctermul=NONE cterm=bold
+    hi WildMenu ctermfg=12 ctermbg=7 ctermul=NONE cterm=reverse
     if s:diffmode == "high"
       hi DiffAdd ctermfg=2 ctermbg=NONE ctermul=NONE cterm=reverse
       hi DiffChange ctermfg=3 ctermbg=NONE ctermul=NONE cterm=reverse
diff --git a/doc/solarized8.txt b/doc/solarized8.txt
index 7ee788f..6e87c96 100644
--- a/doc/solarized8.txt
+++ b/doc/solarized8.txt
@@ -1,4 +1,4 @@
-*solarized8.txt*	For Vim version 9	Last change: 2025 May 28
+*solarized8.txt*	For Vim version 9	Last change: 2025 May 29
 
 
 			Solarized 8 color scheme