diff --git a/colors/solarized8.vim b/colors/solarized8.vim
index 10d3a67..2b79384 100644
--- a/colors/solarized8.vim
+++ b/colors/solarized8.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " Website:      https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Updated: Sun Nov 12 11:51:22 2017
+" Last Updated: Tue Nov 21 09:38:58 2017
 
 if !(has('termguicolors') && &termguicolors) && !has('gui_running')
       \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -45,12 +45,14 @@ if !get(g:, 'solarized_use16', 0)
       hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
       hi Folded ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=#002b36 cterm=NONE,bold gui=NONE,bold
       hi LineNr ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+      hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
       hi CursorLineNr ctermbg=NONE guifg=NONE
     else
       hi Normal ctermfg=246 ctermbg=235 guifg=#839496 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
       hi FoldColumn ctermfg=246 ctermbg=236 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
       hi Folded ctermfg=246 ctermbg=236 guifg=#839496 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold
       hi LineNr ctermfg=242 ctermbg=236 guifg=#586e75 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+      hi Terminal ctermfg=fg ctermbg=235 guifg=fg guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
       hi CursorLineNr ctermbg=236 guibg=#073642
     endif
     if get(g:, "solarized_visibility", "") == "high"
@@ -178,6 +180,8 @@ if !get(g:, 'solarized_use16', 0)
     hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi! link lCursor Cursor
     hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+    hi ToolbarButton ctermfg=247 ctermbg=236 guifg=#93a1a1 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
     hi NormalMode ctermfg=246 ctermbg=230 guifg=#839496 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi InsertMode ctermfg=37 ctermbg=230 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -416,12 +420,14 @@ if !get(g:, 'solarized_use16', 0)
     hi FoldColumn ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=247 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=NONE guifg=NONE
   else
     hi Normal ctermfg=66 ctermbg=230 guifg=#657b83 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
     hi FoldColumn ctermfg=66 ctermbg=254 guifg=#657b83 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=66 ctermbg=254 guifg=#657b83 guibg=#eee8d5 guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=247 ctermbg=254 guifg=#93a1a1 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=230 guifg=fg guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=254 guibg=#eee8d5
   endif
   if get(g:, "solarized_visibility", "") == "high"
@@ -561,6 +567,8 @@ if !get(g:, 'solarized_use16', 0)
   hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=254 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarButton ctermfg=242 ctermbg=254 guifg=#586e75 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold
   hi NormalMode ctermfg=242 ctermbg=230 guifg=#586e75 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi InsertMode ctermfg=37 ctermbg=230 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -783,12 +791,14 @@ if &background ==# 'dark'
     hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=#002b36 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=NONE guifg=NONE
   else
     hi Normal ctermfg=12 ctermbg=8 guifg=#839496 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
     hi FoldColumn ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=10 ctermbg=0 guifg=#586e75 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=8 guifg=fg guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=0 guibg=#073642
   endif
   if get(g:, "solarized_visibility", "") == "high"
@@ -916,6 +926,8 @@ if &background ==# 'dark'
   hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarButton ctermfg=14 ctermbg=0 guifg=#93a1a1 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
   hi NormalMode ctermfg=12 ctermbg=15 guifg=#839496 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -1136,12 +1148,14 @@ if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
   hi FoldColumn ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi Folded ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
   hi LineNr ctermfg=14 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+  hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi CursorLineNr ctermbg=NONE guifg=NONE
 else
   hi Normal ctermfg=11 ctermbg=15 guifg=#657b83 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
   hi FoldColumn ctermfg=11 ctermbg=7 guifg=#657b83 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
   hi Folded ctermfg=11 ctermbg=7 guifg=#657b83 guibg=#eee8d5 guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
   hi LineNr ctermfg=14 ctermbg=7 guifg=#93a1a1 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+  hi Terminal ctermfg=fg ctermbg=15 guifg=fg guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
   hi CursorLineNr ctermbg=7 guibg=#eee8d5
 endif
 if get(g:, "solarized_visibility", "") == "high"
@@ -1281,6 +1295,8 @@ hi! link Typedef Type
 hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
 hi! link lCursor Cursor
 hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+hi ToolbarLine ctermfg=NONE ctermbg=7 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+hi ToolbarButton ctermfg=10 ctermbg=7 guifg=#586e75 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold
 hi NormalMode ctermfg=10 ctermbg=15 guifg=#586e75 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -1517,10 +1533,12 @@ finish
 "   FoldColumn         fg                none
 "   Folded             fg                none             bold s=base03
 "   LineNr             base01            none
+"   Terminal           fg                none
 "   Normal            base0             back
 "   FoldColumn        base0             base02
 "   Folded            base0             base02            bold s=base03
 "   LineNr            base01            base02
+"   Terminal          fg                back
 " NonText              orange            none              bold
 " SpecialKey           orange            none              reverse
 " SpellBad             violet            base3             t=underline,reverse g=undercurl,reverse s=red
@@ -1629,6 +1647,8 @@ finish
 " Underlined           violet            none
 " lCursor           -> Cursor
 " CursorIM             none              fg
+" ToolbarLine          none              base02
+" ToolbarButton        base1             base02            bold
 " NormalMode           base0             base3             reverse
 " InsertMode           cyan              base3             reverse
 " ReplaceMode          orange            base3             reverse
@@ -1832,10 +1852,12 @@ finish
 "   FoldColumn         base0             none
 "   Folded             base0             none              bold s=base03
 "   LineNr             base01            none
+"   Terminal           fg                none
 "   Normal            base0             back
 "   FoldColumn        base0             base02
 "   Folded            base0             base02            bold s=base03
 "   LineNr            base01            base02
+"   Terminal          fg                back
 " Cursor               base03            base0
 " Cursor               base03            red
 " MatchParen           base03            base00            bold
@@ -1950,6 +1972,8 @@ finish
 " Underlined           violet            none
 " lCursor           -> Cursor
 " CursorIM             none              fg
+" ToolbarLine          none              base02
+" ToolbarButton        base1             base02            bold
 " NormalMode           base1             base03            reverse
 " InsertMode           cyan              base03            reverse
 " ReplaceMode          orange            base03            reverse
diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim
index 591e159..91bd829 100644
--- a/colors/solarized8_flat.vim
+++ b/colors/solarized8_flat.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " Website:      https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Updated: Sun Nov 12 11:51:26 2017
+" Last Updated: Tue Nov 21 09:39:02 2017
 
 if !(has('termguicolors') && &termguicolors) && !has('gui_running')
       \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -42,8 +42,10 @@ if !get(g:, 'solarized_use16', 0)
     "  base02: GUI=#073642/rgb(  7, 54, 66)  Term=236 #303030/rgb( 48, 48, 48)  [delta=13.434724]
     if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
       hi Normal ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+      hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     else
       hi Normal ctermfg=246 ctermbg=235 guifg=#839496 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
+      hi Terminal ctermfg=fg ctermbg=235 guifg=fg guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
     endif
     hi ColorColumn ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
     hi Conceal ctermfg=32 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE gui=NONE
@@ -177,6 +179,8 @@ if !get(g:, 'solarized_use16', 0)
     hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi! link lCursor Cursor
     hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+    hi ToolbarButton ctermfg=247 ctermbg=236 guifg=#93a1a1 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
     if get(g:, 'solarized_extra_hi_groups', 0)
       hi! link vimVar Identifier
       hi! link vimFunc Function
@@ -407,8 +411,10 @@ if !get(g:, 'solarized_use16', 0)
   "   base2: GUI=#073642/rgb(  7, 54, 66)  Term=236 #303030/rgb( 48, 48, 48)  [delta=13.434724]
   if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
     hi Normal ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
   else
     hi Normal ctermfg=66 ctermbg=230 guifg=#657b83 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=230 guifg=fg guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
   endif
   if get(g:, "solarized_visibility", "") == "high"
     if get(g:, 'solarized_old_cursor_style', 0)
@@ -554,6 +560,8 @@ if !get(g:, 'solarized_use16', 0)
   hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=254 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarButton ctermfg=242 ctermbg=254 guifg=#586e75 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold
   if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
@@ -768,8 +776,10 @@ endif
 if &background ==# 'dark'
   if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
     hi Normal ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
   else
     hi Normal ctermfg=12 ctermbg=8 guifg=#839496 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=8 guifg=fg guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
   endif
   hi ColorColumn ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
   hi Conceal ctermfg=4 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE gui=NONE
@@ -903,6 +913,8 @@ if &background ==# 'dark'
   hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarButton ctermfg=14 ctermbg=0 guifg=#93a1a1 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
   if get(g:, 'solarized_extra_hi_groups', 0)
     hi! link vimVar Identifier
     hi! link vimFunc Function
@@ -1115,8 +1127,10 @@ endif
 
 if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
   hi Normal ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+  hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
 else
   hi Normal ctermfg=11 ctermbg=15 guifg=#657b83 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
+  hi Terminal ctermfg=fg ctermbg=15 guifg=fg guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
 endif
 if get(g:, "solarized_visibility", "") == "high"
   if get(g:, 'solarized_old_cursor_style', 0)
@@ -1262,6 +1276,8 @@ hi! link Typedef Type
 hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
 hi! link lCursor Cursor
 hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+hi ToolbarLine ctermfg=NONE ctermbg=7 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+hi ToolbarButton ctermfg=10 ctermbg=7 guifg=#586e75 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold
 if get(g:, 'solarized_extra_hi_groups', 0)
   hi! link vimVar Identifier
   hi! link vimFunc Function
@@ -1490,7 +1506,9 @@ finish
 " Color: green                #859900                ~        2
 " Color: back                 #002b36                ~        8
 "   Normal             base0             none
+"   Terminal           fg                none
 "   Normal            base0             back
+"   Terminal          fg                back
 " ColorColumn          none              base02
 " Conceal              blue              none
 " Cursor               base03            base0
@@ -1609,6 +1627,8 @@ finish
 " Underlined           violet            none
 " lCursor           -> Cursor
 " CursorIM             none              fg
+" ToolbarLine          none              base02
+" ToolbarButton        base1             base02            bold
 " vimVar            -> Identifier
 " vimFunc           -> Function
 " vimUserFunc       -> Function
@@ -1804,7 +1824,9 @@ finish
 " Color: green                #859900                ~        2
 " Color: back                 #fdf6e3                ~        15
 "   Normal             base0             none
+"   Terminal           fg                none
 "   Normal            base0             back
+"   Terminal          fg                back
 " Cursor               base03            base0
 " Cursor               base03            red
 " CursorLineNr         red               none              bold
@@ -1929,6 +1951,8 @@ finish
 " Underlined           violet            none
 " lCursor           -> Cursor
 " CursorIM             none              fg
+" ToolbarLine          none              base02
+" ToolbarButton        base1             base02            bold
 " vimVar            -> Identifier
 " vimFunc           -> Function
 " vimUserFunc       -> Function
diff --git a/colors/solarized8_high.vim b/colors/solarized8_high.vim
index 7673999..64009e5 100644
--- a/colors/solarized8_high.vim
+++ b/colors/solarized8_high.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " Website:      https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Updated: Sun Nov 12 11:51:29 2017
+" Last Updated: Tue Nov 21 09:39:06 2017
 
 if !(has('termguicolors') && &termguicolors) && !has('gui_running')
       \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -45,12 +45,14 @@ if !get(g:, 'solarized_use16', 0)
       hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
       hi Folded ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=#002b36 cterm=NONE,bold gui=NONE,bold
       hi LineNr ctermfg=243 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+      hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
       hi CursorLineNr ctermbg=NONE guifg=NONE
     else
       hi Normal ctermfg=247 ctermbg=235 guifg=#93a1a1 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
       hi FoldColumn ctermfg=247 ctermbg=236 guifg=#93a1a1 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
       hi Folded ctermfg=247 ctermbg=236 guifg=#93a1a1 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold
       hi LineNr ctermfg=243 ctermbg=236 guifg=#657b83 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+      hi Terminal ctermfg=fg ctermbg=235 guifg=fg guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
       hi CursorLineNr ctermbg=236 guibg=#073642
     endif
     if get(g:, "solarized_visibility", "") == "high"
@@ -178,6 +180,8 @@ if !get(g:, 'solarized_use16', 0)
     hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi! link lCursor Cursor
     hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+    hi ToolbarButton ctermfg=254 ctermbg=236 guifg=#eee8d5 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
     hi NormalMode ctermfg=247 ctermbg=230 guifg=#93a1a1 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi InsertMode ctermfg=37 ctermbg=230 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -416,12 +420,14 @@ if !get(g:, 'solarized_use16', 0)
     hi FoldColumn ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=247 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=NONE guifg=NONE
   else
     hi Normal ctermfg=242 ctermbg=230 guifg=#586e75 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
     hi FoldColumn ctermfg=242 ctermbg=254 guifg=#586e75 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=242 ctermbg=254 guifg=#586e75 guibg=#eee8d5 guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=247 ctermbg=254 guifg=#93a1a1 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=230 guifg=fg guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=254 guibg=#eee8d5
   endif
   if get(g:, "solarized_visibility", "") == "high"
@@ -561,6 +567,8 @@ if !get(g:, 'solarized_use16', 0)
   hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=254 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarButton ctermfg=236 ctermbg=254 guifg=#073642 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold
   hi NormalMode ctermfg=236 ctermbg=230 guifg=#073642 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi InsertMode ctermfg=37 ctermbg=230 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -783,12 +791,14 @@ if &background ==# 'dark'
     hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=#002b36 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=NONE guifg=NONE
   else
     hi Normal ctermfg=14 ctermbg=8 guifg=#93a1a1 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
     hi FoldColumn ctermfg=14 ctermbg=0 guifg=#93a1a1 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=14 ctermbg=0 guifg=#93a1a1 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=11 ctermbg=0 guifg=#657b83 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=8 guifg=fg guibg=#002b36 guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=0 guibg=#073642
   endif
   if get(g:, "solarized_visibility", "") == "high"
@@ -916,6 +926,8 @@ if &background ==# 'dark'
   hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarButton ctermfg=7 ctermbg=0 guifg=#eee8d5 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
   hi NormalMode ctermfg=14 ctermbg=15 guifg=#93a1a1 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -1136,12 +1148,14 @@ if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
   hi FoldColumn ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi Folded ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
   hi LineNr ctermfg=14 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+  hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi CursorLineNr ctermbg=NONE guifg=NONE
 else
   hi Normal ctermfg=10 ctermbg=15 guifg=#586e75 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
   hi FoldColumn ctermfg=10 ctermbg=7 guifg=#586e75 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
   hi Folded ctermfg=10 ctermbg=7 guifg=#586e75 guibg=#eee8d5 guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
   hi LineNr ctermfg=14 ctermbg=7 guifg=#93a1a1 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+  hi Terminal ctermfg=fg ctermbg=15 guifg=fg guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE
   hi CursorLineNr ctermbg=7 guibg=#eee8d5
 endif
 if get(g:, "solarized_visibility", "") == "high"
@@ -1281,6 +1295,8 @@ hi! link Typedef Type
 hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
 hi! link lCursor Cursor
 hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+hi ToolbarLine ctermfg=NONE ctermbg=7 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+hi ToolbarButton ctermfg=0 ctermbg=7 guifg=#073642 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold
 hi NormalMode ctermfg=0 ctermbg=15 guifg=#073642 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -1517,10 +1533,12 @@ finish
 "   FoldColumn         fg                none
 "   Folded             fg                none             bold s=base03
 "   LineNr             base01            none
+"   Terminal           fg                none
 "   Normal            base0             back
 "   FoldColumn        base0             base02
 "   Folded            base0             base02            bold s=base03
 "   LineNr            base01            base02
+"   Terminal          fg                back
 " NonText              orange            none              bold
 " SpecialKey           orange            none              reverse
 " SpellBad             violet            base3             t=underline,reverse g=undercurl,reverse s=red
@@ -1629,6 +1647,8 @@ finish
 " Underlined           violet            none
 " lCursor           -> Cursor
 " CursorIM             none              fg
+" ToolbarLine          none              base02
+" ToolbarButton        base1             base02            bold
 " NormalMode           base0             base3             reverse
 " InsertMode           cyan              base3             reverse
 " ReplaceMode          orange            base3             reverse
@@ -1832,10 +1852,12 @@ finish
 "   FoldColumn         base0             none
 "   Folded             base0             none              bold s=base03
 "   LineNr             base01            none
+"   Terminal           fg                none
 "   Normal            base0             back
 "   FoldColumn        base0             base02
 "   Folded            base0             base02            bold s=base03
 "   LineNr            base01            base02
+"   Terminal          fg                back
 " Cursor               base03            base0
 " Cursor               base03            red
 " MatchParen           base03            base00            bold
@@ -1950,6 +1972,8 @@ finish
 " Underlined           violet            none
 " lCursor           -> Cursor
 " CursorIM             none              fg
+" ToolbarLine          none              base02
+" ToolbarButton        base1             base02            bold
 " NormalMode           base1             base03            reverse
 " InsertMode           cyan              base03            reverse
 " ReplaceMode          orange            base03            reverse
diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim
index 502668f..66b6024 100644
--- a/colors/solarized8_low.vim
+++ b/colors/solarized8_low.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Lifepillar <lifepillar@lifepillar.me>
 " Website:      https://github.com/lifepillar/vim-solarized8
 " License:      OSI approved MIT license
-" Last Updated: Sun Nov 12 11:51:32 2017
+" Last Updated: Tue Nov 21 09:39:10 2017
 
 if !(has('termguicolors') && &termguicolors) && !has('gui_running')
       \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256))
@@ -45,12 +45,14 @@ if !get(g:, 'solarized_use16', 0)
       hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
       hi Folded ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=#002b36 cterm=NONE,bold gui=NONE,bold
       hi LineNr ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+      hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
       hi CursorLineNr ctermbg=NONE guifg=NONE
     else
       hi Normal ctermfg=246 ctermbg=236 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
       hi FoldColumn ctermfg=246 ctermbg=236 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
       hi Folded ctermfg=246 ctermbg=236 guifg=#839496 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold
       hi LineNr ctermfg=242 ctermbg=236 guifg=#586e75 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+      hi Terminal ctermfg=fg ctermbg=236 guifg=fg guibg=#073642 guisp=NONE cterm=NONE gui=NONE
       hi CursorLineNr ctermbg=236 guibg=#073642
     endif
     hi ColorColumn ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
@@ -178,6 +180,8 @@ if !get(g:, 'solarized_use16', 0)
     hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi! link lCursor Cursor
     hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=236 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+    hi ToolbarButton ctermfg=247 ctermbg=236 guifg=#93a1a1 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
     hi NormalMode ctermfg=246 ctermbg=230 guifg=#839496 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi InsertMode ctermfg=37 ctermbg=230 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
     hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -416,12 +420,14 @@ if !get(g:, 'solarized_use16', 0)
     hi FoldColumn ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=247 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=NONE guifg=NONE
   else
     hi Normal ctermfg=66 ctermbg=254 guifg=#657b83 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
     hi FoldColumn ctermfg=66 ctermbg=254 guifg=#657b83 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=66 ctermbg=254 guifg=#657b83 guibg=#eee8d5 guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=247 ctermbg=254 guifg=#93a1a1 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=254 guifg=fg guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=254 guibg=#eee8d5
   endif
   if get(g:, "solarized_visibility", "") == "high"
@@ -561,6 +567,8 @@ if !get(g:, 'solarized_use16', 0)
   hi Underlined ctermfg=61 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=254 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarButton ctermfg=242 ctermbg=254 guifg=#586e75 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold
   hi NormalMode ctermfg=242 ctermbg=230 guifg=#586e75 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi InsertMode ctermfg=37 ctermbg=230 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi ReplaceMode ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -783,12 +791,14 @@ if &background ==# 'dark'
     hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=#002b36 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=NONE guifg=NONE
   else
     hi Normal ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
     hi FoldColumn ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
     hi Folded ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold
     hi LineNr ctermfg=10 ctermbg=0 guifg=#586e75 guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+    hi Terminal ctermfg=fg ctermbg=0 guifg=fg guibg=#073642 guisp=NONE cterm=NONE gui=NONE
     hi CursorLineNr ctermbg=0 guibg=#073642
   endif
   hi ColorColumn ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
@@ -916,6 +926,8 @@ if &background ==# 'dark'
   hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi! link lCursor Cursor
   hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=0 guifg=NONE guibg=#073642 guisp=NONE cterm=NONE gui=NONE
+  hi ToolbarButton ctermfg=14 ctermbg=0 guifg=#93a1a1 guibg=#073642 guisp=NONE cterm=NONE,bold gui=NONE,bold
   hi NormalMode ctermfg=12 ctermbg=15 guifg=#839496 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
   hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -1136,12 +1148,14 @@ if !has('gui_running') && get(g:, 'solarized_termtrans', 0)
   hi FoldColumn ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi Folded ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
   hi LineNr ctermfg=14 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE gui=NONE
+  hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE
   hi CursorLineNr ctermbg=NONE guifg=NONE
 else
   hi Normal ctermfg=11 ctermbg=7 guifg=#657b83 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
   hi FoldColumn ctermfg=11 ctermbg=7 guifg=#657b83 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
   hi Folded ctermfg=11 ctermbg=7 guifg=#657b83 guibg=#eee8d5 guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold
   hi LineNr ctermfg=14 ctermbg=7 guifg=#93a1a1 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+  hi Terminal ctermfg=fg ctermbg=7 guifg=fg guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
   hi CursorLineNr ctermbg=7 guibg=#eee8d5
 endif
 if get(g:, "solarized_visibility", "") == "high"
@@ -1281,6 +1295,8 @@ hi! link Typedef Type
 hi Underlined ctermfg=13 ctermbg=NONE guifg=#6c71c4 guibg=NONE guisp=NONE cterm=NONE gui=NONE
 hi! link lCursor Cursor
 hi CursorIM ctermfg=NONE ctermbg=fg guifg=NONE guibg=fg guisp=NONE cterm=NONE gui=NONE
+hi ToolbarLine ctermfg=NONE ctermbg=7 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE
+hi ToolbarButton ctermfg=10 ctermbg=7 guifg=#586e75 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold
 hi NormalMode ctermfg=10 ctermbg=15 guifg=#586e75 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi InsertMode ctermfg=6 ctermbg=15 guifg=#2aa198 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
 hi ReplaceMode ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE,reverse gui=NONE,reverse
@@ -1517,10 +1533,12 @@ finish
 "   FoldColumn         fg                none
 "   Folded             fg                none             bold s=base03
 "   LineNr             base01            none
+"   Terminal           fg                none
 "   Normal            base0             back
 "   FoldColumn        base0             base02
 "   Folded            base0             base02            bold s=base03
 "   LineNr            base01            base02
+"   Terminal          fg                back
 " ColorColumn          none              base02
 " Conceal              blue              none
 " NonText              orange            none              bold
@@ -1629,6 +1647,8 @@ finish
 " Underlined           violet            none
 " lCursor           -> Cursor
 " CursorIM             none              fg
+" ToolbarLine          none              base02
+" ToolbarButton        base1             base02            bold
 " NormalMode           base0             base3             reverse
 " InsertMode           cyan              base3             reverse
 " ReplaceMode          orange            base3             reverse
@@ -1832,10 +1852,12 @@ finish
 "   FoldColumn         base0             none
 "   Folded             base0             none              bold s=base03
 "   LineNr             base01            none
+"   Terminal           fg                none
 "   Normal            base0             back
 "   FoldColumn        base0             base02
 "   Folded            base0             base02            bold s=base03
 "   LineNr            base01            base02
+"   Terminal          fg                back
 " Cursor               base03            base0
 " Cursor               base03            red
 " MatchParen           base3             none              bold,underline
@@ -1950,6 +1972,8 @@ finish
 " Underlined           violet            none
 " lCursor           -> Cursor
 " CursorIM             none              fg
+" ToolbarLine          none              base02
+" ToolbarButton        base1             base02            bold
 " NormalMode           base1             base03            reverse
 " InsertMode           cyan              base03            reverse
 " ReplaceMode          orange            base03            reverse
diff --git a/templates/solarized8.colortemplate b/templates/solarized8.colortemplate
index a972dba..c1eda9b 100644
--- a/templates/solarized8.colortemplate
+++ b/templates/solarized8.colortemplate
@@ -50,6 +50,7 @@ endverbatim
   FoldColumn         fg                none
   Folded             fg                none             bold s=base03
   LineNr             base01            none
+  Terminal           fg                none
 
 verbatim
 hi CursorLineNr ctermbg=NONE guifg=NONE
@@ -61,6 +62,7 @@ endverbatim
   FoldColumn        base0             base02
   Folded            base0             base02            bold s=base03
   LineNr            base01            base02
+  Terminal          fg                back
 
 verbatim
 hi CursorLineNr ctermbg=@base02 guibg=@base02
@@ -232,6 +234,9 @@ Underlined           violet            none
 lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
+# See `:help window-toolbar`
+ToolbarLine          none              base02
+ToolbarButton        base1             base02            bold
 # }}}
 
 # Additional highlight groups {{{
@@ -280,6 +285,7 @@ endverbatim
   FoldColumn         base0             none
   Folded             base0             none              bold s=base03
   LineNr             base01            none
+  Terminal           fg                none
 
 verbatim
 hi CursorLineNr ctermbg=NONE guifg=NONE
@@ -291,6 +297,7 @@ endverbatim
   FoldColumn        base0             base02
   Folded            base0             base02            bold s=base03
   LineNr            base01            base02
+  Terminal          fg                back
 
 verbatim
 hi CursorLineNr ctermbg=@base02 guibg=@base02
@@ -479,6 +486,9 @@ Underlined           violet            none
 lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
+# See `:help window-toolbar`
+ToolbarLine          none              base02
+ToolbarButton        base1             base02            bold
 # }}}
 
 # Additional highlight groups {{{
diff --git a/templates/solarized8_flat.colortemplate b/templates/solarized8_flat.colortemplate
index 504d198..9fc7c8e 100644
--- a/templates/solarized8_flat.colortemplate
+++ b/templates/solarized8_flat.colortemplate
@@ -47,6 +47,7 @@ endverbatim
 
   # Transparent background
   Normal             base0             none
+  Terminal           fg                none
 
 verbatim
 else
@@ -54,6 +55,7 @@ endverbatim
 
   # Opaque background
   Normal            base0             back
+  Terminal          fg                back
 
 verbatim
 endif
@@ -231,6 +233,9 @@ Underlined           violet            none
 lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
+# See `:help window-toolbar`
+ToolbarLine          none              base02
+ToolbarButton        base1             base02            bold
 # }}}
 
 # Extra stuff {{{
@@ -268,6 +273,7 @@ endverbatim
 
   # Transparent background
   Normal             base0             none
+  Terminal           fg                none
 
 verbatim
 else
@@ -275,6 +281,7 @@ endverbatim
 
   # Opaque background
   Normal            base0             back
+  Terminal          fg                back
 
 verbatim
 endif
@@ -468,6 +475,9 @@ Underlined           violet            none
 lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
+# See `:help window-toolbar`
+ToolbarLine          none              base02
+ToolbarButton        base1             base02            bold
 # }}}
 
 # Extra stuff {{{
diff --git a/templates/solarized8_high.colortemplate b/templates/solarized8_high.colortemplate
index c09ce62..f642eb6 100644
--- a/templates/solarized8_high.colortemplate
+++ b/templates/solarized8_high.colortemplate
@@ -50,6 +50,7 @@ endverbatim
   FoldColumn         fg                none
   Folded             fg                none             bold s=base03
   LineNr             base01            none
+  Terminal           fg                none
 
 verbatim
 hi CursorLineNr ctermbg=NONE guifg=NONE
@@ -61,6 +62,7 @@ endverbatim
   FoldColumn        base0             base02
   Folded            base0             base02            bold s=base03
   LineNr            base01            base02
+  Terminal          fg                back
 
 verbatim
 hi CursorLineNr ctermbg=@base02 guibg=@base02
@@ -232,6 +234,9 @@ Underlined           violet            none
 lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
+# See `:help window-toolbar`
+ToolbarLine          none              base02
+ToolbarButton        base1             base02            bold
 # }}}
 
 # Additional highlight groups {{{
@@ -280,6 +285,7 @@ endverbatim
   FoldColumn         base0             none
   Folded             base0             none              bold s=base03
   LineNr             base01            none
+  Terminal           fg                none
 
 verbatim
 hi CursorLineNr ctermbg=NONE guifg=NONE
@@ -291,6 +297,7 @@ endverbatim
   FoldColumn        base0             base02
   Folded            base0             base02            bold s=base03
   LineNr            base01            base02
+  Terminal          fg                back
 
 verbatim
 hi CursorLineNr ctermbg=@base02 guibg=@base02
@@ -479,6 +486,9 @@ Underlined           violet            none
 lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
+# See `:help window-toolbar`
+ToolbarLine          none              base02
+ToolbarButton        base1             base02            bold
 # }}}
 
 # Additional highlight groups {{{
diff --git a/templates/solarized8_low.colortemplate b/templates/solarized8_low.colortemplate
index ba442d5..296f917 100644
--- a/templates/solarized8_low.colortemplate
+++ b/templates/solarized8_low.colortemplate
@@ -50,6 +50,7 @@ endverbatim
   FoldColumn         fg                none
   Folded             fg                none             bold s=base03
   LineNr             base01            none
+  Terminal           fg                none
 
 verbatim
 hi CursorLineNr ctermbg=NONE guifg=NONE
@@ -61,6 +62,7 @@ endverbatim
   FoldColumn        base0             base02
   Folded            base0             base02            bold s=base03
   LineNr            base01            base02
+  Terminal          fg                back
 
 verbatim
 hi CursorLineNr ctermbg=@base02 guibg=@base02
@@ -232,6 +234,9 @@ Underlined           violet            none
 lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
+# See `:help window-toolbar`
+ToolbarLine          none              base02
+ToolbarButton        base1             base02            bold
 # }}}
 
 # Additional highlight groups {{{
@@ -280,6 +285,7 @@ endverbatim
   FoldColumn         base0             none
   Folded             base0             none              bold s=base03
   LineNr             base01            none
+  Terminal           fg                none
 
 verbatim
 hi CursorLineNr ctermbg=NONE guifg=NONE
@@ -291,7 +297,7 @@ endverbatim
   FoldColumn        base0             base02
   Folded            base0             base02            bold s=base03
   LineNr            base01            base02
-
+  Terminal          fg                back
 verbatim
 hi CursorLineNr ctermbg=@base02 guibg=@base02
 endif
@@ -479,6 +485,9 @@ Underlined           violet            none
 lCursor           -> Cursor
 # See `:help CursorIM`
 CursorIM             none              fg
+# See `:help window-toolbar`
+ToolbarLine          none              base02
+ToolbarButton        base1             base02            bold
 # }}}
 
 # Additional highlight groups {{{