diff --git a/autoload/airline/themes/onedark.vim b/autoload/airline/themes/onedark.vim
index 0a768e4..a9c32fc 100644
--- a/autoload/airline/themes/onedark.vim
+++ b/autoload/airline/themes/onedark.vim
@@ -12,7 +12,7 @@ function! airline#themes#onedark#refresh()
         \ 'red': airline#themes#get_highlight('Constant'),
         \ }
 
-  let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['String', 'fg'])
+  let s:N1 = airline#themes#get_highlight2(['Cursor', 'fg'], ['String', 'fg'])
   let s:N2 = airline#themes#get_highlight('Pmenu')
   let s:N3 = airline#themes#get_highlight('String')
   let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
@@ -24,23 +24,23 @@ function! airline#themes#onedark#refresh()
 
   let s:I1 = airline#themes#get_highlight('Cursor')
   let s:I2 = s:N2
-  let s:I3 = airline#themes#get_highlight2(['Cursor', 'bg'], ['Normal', 'bg'])
+  let s:I3 = airline#themes#get_highlight2(['Cursor', 'bg'], ['Cursor', 'fg'])
   let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
   let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified
 
-  let s:R1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Error', 'fg'])
+  let s:R1 = airline#themes#get_highlight2(['Cursor', 'fg'], ['Error', 'fg'])
   let s:R2 = s:N2
   let s:R3 = airline#themes#get_highlight('Error')
   let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
   let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified
 
-  let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Statement', 'fg'])
+  let s:V1 = airline#themes#get_highlight2(['Cursor', 'fg'], ['Statement', 'fg'])
   let s:V2 = s:N2
-  let s:V3 = airline#themes#get_highlight2(['Statement', 'fg'], ['Normal', 'bg'])
+  let s:V3 = airline#themes#get_highlight2(['Statement', 'fg'], ['Cursor', 'fg'])
   let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
   let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified
 
-  let s:IA1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Normal', 'fg'])
+  let s:IA1 = airline#themes#get_highlight2(['Cursor', 'fg'], ['Normal', 'fg'])
   let s:IA2 = airline#themes#get_highlight2(['Normal', 'fg'], ['Visual', 'bg'])
   let s:IA3 = s:N2
   let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
@@ -51,7 +51,7 @@ function! airline#themes#onedark#refresh()
   " Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim)
 
   " Warnings
-  let s:WI = airline#themes#get_highlight2(['WarningMsg', 'bg'], ['WarningMsg', 'fg'], 'bold')
+  let s:WI = airline#themes#get_highlight2(['Cursor', 'fg'], ['WarningMsg', 'fg'], 'bold')
   let g:airline#themes#onedark#palette.normal.airline_warning = [
        \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
        \ ]
@@ -78,7 +78,7 @@ function! airline#themes#onedark#refresh()
       \ g:airline#themes#onedark#palette.normal.airline_warning
 
   " Errors
-  let s:ER = airline#themes#get_highlight2(['ErrorMsg', 'bg'], ['ErrorMsg', 'fg'], 'bold')
+  let s:ER = airline#themes#get_highlight2(['Cursor', 'fg'], ['ErrorMsg', 'fg'], 'bold')
   let g:airline#themes#onedark#palette.normal.airline_error = [
        \ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
        \ ]