diff --git a/autoload/airline/themes/tomorrow.vim b/autoload/airline/themes/tomorrow.vim
index 467ec2a..caca600 100644
--- a/autoload/airline/themes/tomorrow.vim
+++ b/autoload/airline/themes/tomorrow.vim
@@ -4,12 +4,14 @@ function! s:generate()
   let s:N2 = airline#themes#get_highlight('Pmenu')
   let s:N3 = airline#themes#get_highlight('CursorLine')
   let g:airline#themes#tomorrow#normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+
+  let group = airline#themes#get_highlight('vimCommand')
   let g:airline#themes#tomorrow#normal_modified = {
-        \ 'statusline': airline#themes#get_highlight('vimCommand')
+        \ 'statusline': [ group[0], '', group[2], '', '' ]
         \ }
 
-  let s:I1 = airline#themes#get_highlight('Search', 'bold')
-  let s:I2 = s:N2
+  let s:I1 = airline#themes#get_highlight2(['Ignore', 'fg'], ['MoreMsg', 'fg'], 'bold')
+  let s:I2 = airline#themes#get_highlight2(['MoreMsg', 'fg'], ['Normal', 'bg'])
   let s:I3 = s:N3
   let g:airline#themes#tomorrow#insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
   let g:airline#themes#tomorrow#insert_modified = g:airline#themes#tomorrow#normal_modified
@@ -21,7 +23,7 @@ function! s:generate()
   let g:airline#themes#tomorrow#replace_modified = g:airline#themes#tomorrow#normal_modified
 
   let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
-  let s:V2 = s:N2
+  let s:V2 = airline#themes#get_highlight('WarningMsg')
   let s:V3 = s:N3
   let g:airline#themes#tomorrow#visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
   let g:airline#themes#tomorrow#visual_modified = g:airline#themes#tomorrow#normal_modified