diff --git a/vim/.vim/colors/molokai.vim b/vim/.vim/colors/molokai.vim
index d1ebf65d..aff4bd17 100755
--- a/vim/.vim/colors/molokai.vim
+++ b/vim/.vim/colors/molokai.vim
@@ -1,5 +1,6 @@
 " Vim color file
-"
+" 
+" Maintainer: VOLDIKSS <dyzplus@gmail.com>
 " Author: Tomas Restrepo <tomas@winterdom.com>
 " https://github.com/tomasr/molokai
 "
@@ -8,8 +9,9 @@
 " by Hamish Stuart Macpherson
 
 " ===================================================================
-" Added by voldikss
+" Specified by voldikss
 let g:rehash256 = 1
+let g:molokai_italics = 0
 " ===================================================================
 
 hi clear
@@ -30,6 +32,11 @@ else
     let s:molokai_original = 0
 endif
 
+if exists("g:molokai_italic")
+    let s:molokai_italic = g:molokai_italic
+else
+    let s:molokai_italic = 1
+endif
 
 hi Boolean         guifg=#AE81FF
 hi Character       guifg=#E6DB74
@@ -45,11 +52,16 @@ hi Delimiter       guifg=#8F8F8F
 hi DiffAdd                       guibg=#13354A
 hi DiffChange      guifg=#89807D guibg=#4C4745
 hi DiffDelete      guifg=#960050 guibg=#1E0010
-hi DiffText                      guibg=#4C4745 gui=italic,bold
+if s:molokai_italic
+    hi DiffText                  guibg=#4C4745 gui=italic,bold
+else
+    hi DiffText                  guibg=#4C4745 gui=bold
+endif
 
 hi Directory       guifg=#A6E22E               gui=bold
-hi Error           guifg=#E6DB74 guibg=#1E0010
+hi Error           guifg=#E6DB74 guibg=#ff3333
 hi ErrorMsg        guifg=#F92672 guibg=#232526 gui=bold
+
 hi Exception       guifg=#A6E22E               gui=bold
 hi Float           guifg=#AE81FF
 hi FoldColumn      guifg=#465457 guibg=#000000
@@ -61,8 +73,13 @@ hi IncSearch       guifg=#C4BE89 guibg=#000000
 
 hi Keyword         guifg=#F92672               gui=bold
 hi Label           guifg=#E6DB74               gui=none
-hi Macro           guifg=#C4BE89               gui=italic
-hi SpecialKey      guifg=#66D9EF               gui=italic
+if s:molokai_italic
+    hi Macro       guifg=#C4BE89               gui=italic
+    hi SpecialKey  guifg=#66D9EF               gui=italic
+else
+    hi Macro       guifg=#C4BE89
+    hi SpecialKey  guifg=#66D9EF
+endif
 
 hi MatchParen      guifg=#ffff00 guibg=#333333 gui=bold
 hi ModeMsg         guifg=#E6DB74
@@ -86,7 +103,11 @@ hi Search          guifg=#000000 guibg=#FFE792
 hi SignColumn      guifg=#A6E22E guibg=#232526
 hi SpecialChar     guifg=#F92672               gui=bold
 hi SpecialComment  guifg=#7E8E91               gui=bold
-hi Special         guifg=#66D9EF guibg=bg      gui=italic
+if s:molokai_italic
+    hi Special     guifg=#66D9EF guibg=bg      gui=italic
+else
+    hi Special     guifg=#66D9EF guibg=bg
+endif
 if has("spell")
     hi SpellBad    guisp=#FF0000 gui=undercurl
     hi SpellCap    guisp=#7070F0 gui=undercurl
@@ -96,9 +117,17 @@ endif
 hi Statement       guifg=#F92672               gui=bold
 hi StatusLine      guifg=#455354 guibg=fg
 hi StatusLineNC    guifg=#808080 guibg=#080808
-hi StorageClass    guifg=#FD971F               gui=italic
+if s:molokai_italic
+    hi StorageClass guifg=#FD971F              gui=italic
+else
+    hi StorageClass guifg=#FD971F
+endif
 hi Structure       guifg=#66D9EF
-hi Tag             guifg=#F92672               gui=italic
+if s:molokai_italic
+    hi Tag         guifg=#F92672               gui=italic
+else
+    hi Tag         guifg=#F92672
+endif
 hi Title           guifg=#ef5939
 hi Todo            guifg=#0000FF guibg=bg      gui=bold
 
@@ -167,7 +196,7 @@ if &t_Co > 255
    hi DiffText                    ctermbg=102 cterm=bold
 
    hi Directory       ctermfg=118               cterm=bold
-   hi Error           ctermfg=219 ctermbg=89
+   hi Error           ctermfg=255 ctermbg=196
    hi ErrorMsg        ctermfg=199 ctermbg=16    cterm=bold
    hi Exception       ctermfg=118               cterm=bold
    hi Float           ctermfg=135