diff --git a/autoload/airline/themes/badwolf.vim b/autoload/airline/themes/badwolf.vim
index 0f1d932..c768c68 100644
--- a/autoload/airline/themes/badwolf.vim
+++ b/autoload/airline/themes/badwolf.vim
@@ -1,12 +1,14 @@
+let s:N1 = [ '#141413' , '#aeee00' , 232 , 154 ]
+let s:N2 = [ '#f4cf86' , '#45413b' , 222 , 238 ]
+let s:N3 = [ '#8cffba' , '#242321' , 121 , 235 ]
 let g:airline#themes#badwolf#normal = {
-      \ 'mode':           [ '#141413' , '#aeee00' , 232 , 154 , 'bold' ] ,
-      \ 'mode_separator': [ '#aeee00' , '#45413b' , 154 , 238 , 'bold' ] ,
-      \ 'info':           [ '#f4cf86' , '#45413b' , 222 , 238 , ''     ] ,
-      \ 'info_separator': [ '#45413b' , '#242321' , 238 , 235 , 'bold' ] ,
-      \ 'statusline':     [ '#8cffba' , '#242321' , 121 , 235 , ''     ] ,
-      \ 'statusline_nc':  [ '#000000' , '#242321' , 16  , 235 , ''     ] ,
-      \ 'file':           [ '#ff2c4b' , '#242321' , 196 , 235 , ''     ] ,
-      \ 'inactive':       [ '#45413b' , '#242321' , 238 , 235 , ''     ] ,
+      \ 'mode':           [ s:N1[0]   , s:N1[1]   , s:N1[2] , s:N1[3] , 'bold' ] ,
+      \ 'mode_separator': [ s:N1[1]   , s:N2[1]   , s:N1[3] , s:N2[3] , 'bold' ] ,
+      \ 'info':           [ s:N2[0]   , s:N2[1]   , s:N2[2] , s:N2[3] , ''     ] ,
+      \ 'info_separator': [ s:N2[1]   , s:N3[1]   , s:N2[3] , s:N3[3] , 'bold' ] ,
+      \ 'statusline':     [ s:N3[0]   , s:N3[1]   , s:N3[2] , s:N3[3] , ''     ] ,
+      \ 'file':           [ '#ff2c4b' , '#242321' , 196     , 235     , ''     ] ,
+      \ 'inactive':       [ '#45413b' , '#242321' , 238     , 235     , ''     ] ,
       \ }
 let g:airline#themes#badwolf#normal_modified = copy(g:airline#themes#badwolf#normal)
 let g:airline#themes#badwolf#normal_modified.mode_separator = [ '#aeee00' , '#666462' , 154 , 241 , 'bold' ]
@@ -15,23 +17,29 @@ let g:airline#themes#badwolf#normal_modified.info_separator = [ '#666462' , '#45
 let g:airline#themes#badwolf#normal_modified.statusline     = [ '#ffa724' , '#45413b' , 214 , 238 , '' ]
 let g:airline#themes#badwolf#normal_modified.inactive       = [ '#88633f' , '#45413b' , 95  , 238 , '' ]
 
+let s:I1 = [ '#141413' , '#0a9dff' , 232 , 39  ]
+let s:I2 = [ '#f4cf86' , '#005fff' , 222 , 27  ]
+let s:I3 = [ '#0a9dff' , '#242321' , 39  , 235 ]
 let g:airline#themes#badwolf#insert = {
-      \ 'mode':           [ '#141413' , '#0a9dff' , 232 , 39  , 'bold' ] ,
-      \ 'mode_separator': [ '#0a9dff' , '#005fff' , 39  , 27  , 'bold' ] ,
-      \ 'info':           [ '#f4cf86' , '#005fff' , 222 , 27  , ''     ] ,
-      \ 'info_separator': [ '#005fff' , '#242321' , 27  , 235 , 'bold' ] ,
-      \ 'statusline':     [ '#0a9dff' , '#242321' , 39  , 235 , ''     ] ,
+      \ 'mode':           [ s:I1[0]   , s:I1[1]   , s:I1[2] , s:I1[3] , 'bold' ] ,
+      \ 'mode_separator': [ s:I1[1]   , s:I2[1]   , s:I1[3] , s:I2[3] , 'bold' ] ,
+      \ 'info':           [ s:I2[0]   , s:I2[1]   , s:I2[2] , s:I2[3] , ''     ] ,
+      \ 'info_separator': [ s:I2[1]   , s:I3[1]   , s:I2[3] , s:I3[3] , 'bold' ] ,
+      \ 'statusline':     [ s:I3[0]   , s:I3[1]   , s:I3[2] , s:I3[3] , ''     ] ,
       \ }
 let g:airline#themes#badwolf#insert_modified = copy(g:airline#themes#badwolf#insert)
 let g:airline#themes#badwolf#insert_modified.info_separator = [ '#005fff' , '#45413b' , 27  , 238 , 'bold' ]
 let g:airline#themes#badwolf#insert_modified.statusline     = [ '#ffa724' , '#45413b' , 214 , 238 , '' ]
 
+let s:V1 = [ '#141413' , '#ffa724' , 232 , 214 ]
+let s:V2 = [ '#000000' , '#fade3e' , 16  , 221 ]
+let s:V3 = [ '#000000' , '#b88853' , 16  , 137 ]
 let g:airline#themes#badwolf#visual = {
-      \ 'mode':           [ '#141413' , '#ffa724' , 232 , 214 , 'bold' ] ,
-      \ 'mode_separator': [ '#ffa724' , '#fade3e' , 214 , 221 , 'bold' ] ,
-      \ 'info':           [ '#000000' , '#fade3e' , 16  , 221 , ''     ] ,
-      \ 'info_separator': [ '#fade3e' , '#b88853' , 221 , 137 , 'bold' ] ,
-      \ 'statusline':     [ '#000000' , '#b88853' , 16  , 137 , ''     ] ,
+      \ 'mode':           [ s:V1[0]   , s:V1[1]   , s:V1[2] , s:V1[3] , 'bold' ] ,
+      \ 'mode_separator': [ s:V1[1]   , s:V2[1]   , s:V1[3] , s:V2[3] , 'bold' ] ,
+      \ 'info':           [ s:V2[0]   , s:V2[1]   , s:V2[2] , s:V2[3] , ''     ] ,
+      \ 'info_separator': [ s:V2[1]   , s:V3[1]   , s:V2[3] , s:V3[3] , 'bold' ] ,
+      \ 'statusline':     [ s:V3[0]   , s:V3[1]   , s:V3[2] , s:V3[3] , ''     ] ,
       \ }
 let g:airline#themes#badwolf#visual_modified = copy(g:airline#themes#badwolf#visual)
 let g:airline#themes#badwolf#visual_modified.info_separator = [ '#fade3e' , '#c7915b' , 221 , 173 , 'bold' ]