diff --git a/autoload/airline/themes/molokai.vim b/autoload/airline/themes/molokai.vim
index 1998f00..8e87b56 100644
--- a/autoload/airline/themes/molokai.vim
+++ b/autoload/airline/themes/molokai.vim
@@ -28,21 +28,24 @@ let g:airline#themes#molokai#palette.insert_modified = {
 
 
 " Replace mode
-let g:airline#themes#molokai#palette.replace = copy(g:airline#themes#molokai#palette.insert)
-let g:airline#themes#molokai#palette.replace.airline_a = [ s:I1[0]   , '#ef5939' , s:I1[2] , 166     , ''     ]
+let s:R1 = [ '#080808' , '#f92672' , 232 , 161 ]
+let s:R2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
+let s:R3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
+
+let g:airline#themes#molokai#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 let g:airline#themes#molokai#palette.replace_modified = {
-      \ 'airline_c': [ '#080808' , '#ef5939' , 232 , 166 , '' ] ,
+      \ 'airline_c': [ '#080808' , '#f92672' , 232 , 161 , '' ] ,
       \ }
 
 
 " Visual mode
-let s:V1 = [ '#080808' , '#fd971f' , 232 , 208 ]
+let s:V1 = [ '#080808' , '#a6e22e' , 232 , 118 ]
 let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 16  ]
 let s:V3 = [ '#f8f8f0' , '#465457' , 253 , 67  ]
 
 let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#molokai#palette.visual_modified = {
-      \ 'airline_c': [ '#080808' , '#fd971f' , 232 , 208 , '' ] ,
+      \ 'airline_c': [ '#080808' , '#a6e22e' , 232 , 118 , '' ] ,
       \ }