diff --git a/vim/README.md b/vim/README.md
index 6c5634a..2a121aa 100644
--- a/vim/README.md
+++ b/vim/README.md
@@ -27,6 +27,23 @@ color](https://gist.github.com/XVilka/8346728#now-supporting-true-color), add
    issue](https://github.com/jan-warchol/selenized/issues/65) for more details)
 
 
+Syntax coloring choices
+-----------------------
+
+Selenized aims to have a similar feel to Solarized, but it doesn't follow all
+Solarized coloring choices. In particular, I believe that using green for
+keywords doesn't look good, so I've made them yellow (swapping with types,
+which are yellow in Solarized). If you don't like this choice, add this to your
+`.vimrc`:
+
+    let g:selenized_green_keywords=1
+
+Also note that selenized doesn't use orange and violet because they are not
+available in ANSI color palette (Solarized worked around this with an [ugly
+hack](https://github.com/jan-warchol/selenized/blob/master/whats-wrong-with-solarized.md#problems-with-implementation)).
+However, I plan to use orange and violet in the GUI version of the theme.
+
+
 Contributing
 ------------
 
diff --git a/vim/_hl_groups.colortemplate b/vim/_hl_groups.colortemplate
index df0e3f3..123f881 100644
--- a/vim/_hl_groups.colortemplate
+++ b/vim/_hl_groups.colortemplate
@@ -12,7 +12,7 @@ Normal               fg_0          bg_0
 
 # Group              Foreground    Background    Attributes
 IncSearch            red           none          reverse
-Search               none          none          reverse
+Search               yellow        none          reverse
 Visual               none          bg_2
 LineNr               dim_0         bg_1
 CursorLineNr         fg_1          none
@@ -50,19 +50,24 @@ lCursor           -> Cursor
 
 # Group              Foreground    Background    Attributes
 Comment              dim_0         none          italic
-Constant             red           none
-String               green         none
-Statement            br_yellow     none          bold
-Identifier           magenta       none
-PreProc              blue          none          bold
-Special              blue          none
+Constant             cyan          none
+Identifier           br_blue       none
+Statement            br_yellow     none
+PreProc              magenta       none
 Type                 green         none
+Special              red           none
 Error                red           none          bold
-Todo                 br_yellow     bg_1          reverse
+Todo                 magenta       bg_1          bold reverse
 Underlined           blue          none          underline
 
+#if get(g:, '@optionprefix_green_keywords', 0)
+  Statement            green         none
+  Type                 yellow        none
+#endif
+
 # commonly linked groups
 Function          -> Identifier
+String            -> Constant
 Number            -> Constant
 Boolean           -> Constant
 Character         -> Constant
diff --git a/vim/colors/selenized.vim b/vim/colors/selenized.vim
index 6161ba4..bd1f4de 100644
--- a/vim/colors/selenized.vim
+++ b/vim/colors/selenized.vim
@@ -2,7 +2,7 @@
 " Author:       Jan Warchoł <jan.warchol@gmail.com>
 " Maintainer:   Jan Warchoł <jan.warchol@gmail.com>
 " License:      Vim License (see `:help license`)
-" Last Updated: Thu Mar  5 18:17:36 2020
+" Last Updated: Sun Mar 22 08:25:07 2020
 
 " Generated by Colortemplate v2.0.0
 
@@ -41,7 +41,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     endif
     hi Normal guifg=#adbcbc guibg=#103c48 guisp=NONE gui=NONE cterm=NONE
     hi IncSearch guifg=#fa5750 guibg=NONE guisp=NONE gui=reverse cterm=reverse
-    hi Search guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search guifg=#dbb32d guibg=NONE guisp=NONE gui=reverse cterm=reverse
     hi Visual guifg=NONE guibg=#2d5b69 guisp=NONE gui=NONE cterm=NONE
     hi LineNr guifg=#72898f guibg=#184956 guisp=NONE gui=NONE cterm=NONE
     hi CursorLineNr guifg=#cad8d9 guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -66,17 +66,24 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi! link StatusLineTermNC StatusLineNC
     hi! link lCursor Cursor
     hi Comment guifg=#72898f guibg=NONE guisp=NONE gui=italic cterm=italic
-    hi Constant guifg=#fa5750 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi String guifg=#75b938 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Statement guifg=#ebc13d guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Identifier guifg=#f275be guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi PreProc guifg=#4695f7 guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Special guifg=#4695f7 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Constant guifg=#41c7b9 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Identifier guifg=#58a3ff guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Statement guifg=#ebc13d guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi PreProc guifg=#f275be guibg=NONE guisp=NONE gui=NONE cterm=NONE
     hi Type guifg=#75b938 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Special guifg=#fa5750 guibg=NONE guisp=NONE gui=NONE cterm=NONE
     hi Error guifg=#fa5750 guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Todo guifg=#ebc13d guibg=#184956 guisp=NONE gui=reverse cterm=reverse
+    hi Todo guifg=#f275be guibg=#184956 guisp=NONE gui=bold,reverse cterm=bold,reverse
     hi Underlined guifg=#4695f7 guibg=NONE guisp=NONE gui=underline cterm=underline
+    if !s:italics
+      hi Comment gui=NONE cterm=NONE
+    endif
+    if get(g:, 'selenized_green_keywords', 0)
+      hi Statement guifg=#75b938 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+      hi Type guifg=#dbb32d guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    endif
     hi! link Function Identifier
+    hi! link String Constant
     hi! link Number Constant
     hi! link Boolean Constant
     hi! link Character Constant
@@ -99,6 +106,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi! link StorageClass Type
     hi! link Structure Type
     hi! link Typedef Type
+    hi! link VimCommand Statement
     hi Terminal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -126,9 +134,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi WarningMsg guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WildMenu guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-    if !s:italics
-      hi Comment gui=NONE cterm=NONE
-    endif
     unlet s:t_Co s:italics
     finish
   endif
@@ -156,7 +161,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   endif
   hi Normal guifg=#53676d guibg=#fbf3db guisp=NONE gui=NONE cterm=NONE
   hi IncSearch guifg=#d2212d guibg=NONE guisp=NONE gui=reverse cterm=reverse
-  hi Search guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Search guifg=#ad8900 guibg=NONE guisp=NONE gui=reverse cterm=reverse
   hi Visual guifg=NONE guibg=#cfcebe guisp=NONE gui=NONE cterm=NONE
   hi LineNr guifg=#909995 guibg=#e9e4d0 guisp=NONE gui=NONE cterm=NONE
   hi CursorLineNr guifg=#3a4d53 guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -181,17 +186,24 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi! link StatusLineTermNC StatusLineNC
   hi! link lCursor Cursor
   hi Comment guifg=#909995 guibg=NONE guisp=NONE gui=italic cterm=italic
-  hi Constant guifg=#d2212d guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi String guifg=#489100 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#a78300 guibg=NONE guisp=NONE gui=bold cterm=bold
-  hi Identifier guifg=#ca4898 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#0072d4 guibg=NONE guisp=NONE gui=bold cterm=bold
-  hi Special guifg=#0072d4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#009c8f guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=#006dce guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#a78300 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#ca4898 guibg=NONE guisp=NONE gui=NONE cterm=NONE
   hi Type guifg=#489100 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Special guifg=#d2212d guibg=NONE guisp=NONE gui=NONE cterm=NONE
   hi Error guifg=#d2212d guibg=NONE guisp=NONE gui=bold cterm=bold
-  hi Todo guifg=#a78300 guibg=#e9e4d0 guisp=NONE gui=reverse cterm=reverse
+  hi Todo guifg=#ca4898 guibg=#e9e4d0 guisp=NONE gui=bold,reverse cterm=bold,reverse
   hi Underlined guifg=#0072d4 guibg=NONE guisp=NONE gui=underline cterm=underline
+  if !s:italics
+    hi Comment gui=NONE cterm=NONE
+  endif
+  if get(g:, 'selenized_green_keywords', 0)
+    hi Statement guifg=#489100 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Type guifg=#ad8900 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  endif
   hi! link Function Identifier
+  hi! link String Constant
   hi! link Number Constant
   hi! link Boolean Constant
   hi! link Character Constant
@@ -214,6 +226,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi! link StorageClass Type
   hi! link Structure Type
   hi! link Typedef Type
+  hi! link VimCommand Statement
   hi Terminal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -241,9 +254,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi WarningMsg guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi WildMenu guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  if !s:italics
-    hi Comment gui=NONE cterm=NONE
-  endif
   unlet s:t_Co s:italics
   finish
 endif
@@ -255,7 +265,7 @@ if s:t_Co >= 256
       set background=dark
     endif
     hi IncSearch ctermfg=203 ctermbg=NONE cterm=reverse
-    hi Search ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=178 ctermbg=NONE cterm=reverse
     hi Visual ctermfg=NONE ctermbg=240 cterm=NONE
     hi LineNr ctermfg=245 ctermbg=238 cterm=NONE
     hi CursorLineNr ctermfg=252 ctermbg=NONE cterm=NONE
@@ -280,17 +290,24 @@ if s:t_Co >= 256
     hi! link StatusLineTermNC StatusLineNC
     hi! link lCursor Cursor
     hi Comment ctermfg=245 ctermbg=NONE cterm=italic
-    hi Constant ctermfg=203 ctermbg=NONE cterm=NONE
-    hi String ctermfg=70 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=178 ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=205 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=33 ctermbg=NONE cterm=bold
-    hi Special ctermfg=33 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=44 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=39 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=178 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=205 ctermbg=NONE cterm=NONE
     hi Type ctermfg=70 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=203 ctermbg=NONE cterm=NONE
     hi Error ctermfg=203 ctermbg=NONE cterm=bold
-    hi Todo ctermfg=178 ctermbg=238 cterm=reverse
+    hi Todo ctermfg=205 ctermbg=238 cterm=bold,reverse
     hi Underlined ctermfg=33 ctermbg=NONE cterm=underline
+    if !s:italics
+      hi Comment cterm=NONE
+    endif
+    if get(g:, 'selenized_green_keywords', 0)
+      hi Statement ctermfg=70 ctermbg=NONE cterm=NONE
+      hi Type ctermfg=178 ctermbg=NONE cterm=NONE
+    endif
     hi! link Function Identifier
+    hi! link String Constant
     hi! link Number Constant
     hi! link Boolean Constant
     hi! link Character Constant
@@ -313,6 +330,7 @@ if s:t_Co >= 256
     hi! link StorageClass Type
     hi! link Structure Type
     hi! link Typedef Type
+    hi! link VimCommand Statement
     hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -340,16 +358,13 @@ if s:t_Co >= 256
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    if !s:italics
-      hi Comment cterm=NONE
-    endif
     unlet s:t_Co s:italics
     finish
   endif
   " Light background
   hi Normal ctermfg=241 ctermbg=230 cterm=NONE
   hi IncSearch ctermfg=160 ctermbg=NONE cterm=reverse
-  hi Search ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Search ctermfg=136 ctermbg=NONE cterm=reverse
   hi Visual ctermfg=NONE ctermbg=252 cterm=NONE
   hi LineNr ctermfg=246 ctermbg=187 cterm=NONE
   hi CursorLineNr ctermfg=239 ctermbg=NONE cterm=NONE
@@ -374,17 +389,24 @@ if s:t_Co >= 256
   hi! link StatusLineTermNC StatusLineNC
   hi! link lCursor Cursor
   hi Comment ctermfg=246 ctermbg=NONE cterm=italic
-  hi Constant ctermfg=160 ctermbg=NONE cterm=NONE
-  hi String ctermfg=64 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=136 ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=169 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=25 ctermbg=NONE cterm=bold
-  hi Special ctermfg=25 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=37 ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=25 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=136 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=169 ctermbg=NONE cterm=NONE
   hi Type ctermfg=64 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=160 ctermbg=NONE cterm=NONE
   hi Error ctermfg=160 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=136 ctermbg=187 cterm=reverse
+  hi Todo ctermfg=169 ctermbg=187 cterm=bold,reverse
   hi Underlined ctermfg=25 ctermbg=NONE cterm=underline
+  if !s:italics
+    hi Comment cterm=NONE
+  endif
+  if get(g:, 'selenized_green_keywords', 0)
+    hi Statement ctermfg=64 ctermbg=NONE cterm=NONE
+    hi Type ctermfg=136 ctermbg=NONE cterm=NONE
+  endif
   hi! link Function Identifier
+  hi! link String Constant
   hi! link Number Constant
   hi! link Boolean Constant
   hi! link Character Constant
@@ -407,6 +429,7 @@ if s:t_Co >= 256
   hi! link StorageClass Type
   hi! link Structure Type
   hi! link Typedef Type
+  hi! link VimCommand Statement
   hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -434,9 +457,6 @@ if s:t_Co >= 256
   hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  if !s:italics
-    hi Comment cterm=NONE
-  endif
   unlet s:t_Co s:italics
   finish
 endif
@@ -445,7 +465,7 @@ if s:t_Co >= 16
   if &background ==# 'dark'
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi IncSearch ctermfg=DarkRed ctermbg=NONE cterm=reverse
-    hi Search ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=DarkYellow ctermbg=NONE cterm=reverse
     hi Visual ctermfg=NONE ctermbg=DarkGrey cterm=NONE
     hi LineNr ctermfg=LightGrey ctermbg=Black cterm=NONE
     hi CursorLineNr ctermfg=White ctermbg=NONE cterm=NONE
@@ -470,17 +490,24 @@ if s:t_Co >= 16
     hi! link StatusLineTermNC StatusLineNC
     hi! link lCursor Cursor
     hi Comment ctermfg=LightGrey ctermbg=NONE cterm=italic
-    hi Constant ctermfg=DarkRed ctermbg=NONE cterm=NONE
-    hi String ctermfg=DarkGreen ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=LightYellow ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=DarkBlue ctermbg=NONE cterm=bold
-    hi Special ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=LightBlue ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=LightYellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
     hi Type ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi Special ctermfg=DarkRed ctermbg=NONE cterm=NONE
     hi Error ctermfg=DarkRed ctermbg=NONE cterm=bold
-    hi Todo ctermfg=LightYellow ctermbg=Black cterm=reverse
+    hi Todo ctermfg=DarkMagenta ctermbg=Black cterm=bold,reverse
     hi Underlined ctermfg=DarkBlue ctermbg=NONE cterm=underline
+    if !s:italics
+      hi Comment cterm=NONE
+    endif
+    if get(g:, 'selenized_green_keywords', 0)
+      hi Statement ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+      hi Type ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    endif
     hi! link Function Identifier
+    hi! link String Constant
     hi! link Number Constant
     hi! link Boolean Constant
     hi! link Character Constant
@@ -503,6 +530,7 @@ if s:t_Co >= 16
     hi! link StorageClass Type
     hi! link Structure Type
     hi! link Typedef Type
+    hi! link VimCommand Statement
     hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -530,16 +558,13 @@ if s:t_Co >= 16
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    if !s:italics
-      hi Comment cterm=NONE
-    endif
     unlet s:t_Co s:italics
     finish
   endif
   " Light background
   hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=DarkRed ctermbg=NONE cterm=reverse
-  hi Search ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Search ctermfg=DarkYellow ctermbg=NONE cterm=reverse
   hi Visual ctermfg=NONE ctermbg=DarkGrey cterm=NONE
   hi LineNr ctermfg=LightGrey ctermbg=Black cterm=NONE
   hi CursorLineNr ctermfg=White ctermbg=NONE cterm=NONE
@@ -564,17 +589,24 @@ if s:t_Co >= 16
   hi! link StatusLineTermNC StatusLineNC
   hi! link lCursor Cursor
   hi Comment ctermfg=LightGrey ctermbg=NONE cterm=italic
-  hi Constant ctermfg=DarkRed ctermbg=NONE cterm=NONE
-  hi String ctermfg=DarkGreen ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=LightYellow ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=DarkBlue ctermbg=NONE cterm=bold
-  hi Special ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=LightBlue ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=LightYellow ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
   hi Type ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+  hi Special ctermfg=DarkRed ctermbg=NONE cterm=NONE
   hi Error ctermfg=DarkRed ctermbg=NONE cterm=bold
-  hi Todo ctermfg=LightYellow ctermbg=Black cterm=reverse
+  hi Todo ctermfg=DarkMagenta ctermbg=Black cterm=bold,reverse
   hi Underlined ctermfg=DarkBlue ctermbg=NONE cterm=underline
+  if !s:italics
+    hi Comment cterm=NONE
+  endif
+  if get(g:, 'selenized_green_keywords', 0)
+    hi Statement ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi Type ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+  endif
   hi! link Function Identifier
+  hi! link String Constant
   hi! link Number Constant
   hi! link Boolean Constant
   hi! link Character Constant
@@ -597,6 +629,7 @@ if s:t_Co >= 16
   hi! link StorageClass Type
   hi! link Structure Type
   hi! link Typedef Type
+  hi! link VimCommand Statement
   hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -624,9 +657,6 @@ if s:t_Co >= 16
   hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  if !s:italics
-    hi Comment cterm=NONE
-  endif
   unlet s:t_Co s:italics
   finish
 endif
diff --git a/vim/colors/selenized_bw.vim b/vim/colors/selenized_bw.vim
index 6be0624..29b028e 100644
--- a/vim/colors/selenized_bw.vim
+++ b/vim/colors/selenized_bw.vim
@@ -2,7 +2,7 @@
 " Author:       Jan Warchoł <jan.warchol@gmail.com>
 " Maintainer:   Jan Warchoł <jan.warchol@gmail.com>
 " License:      Vim License (see `:help license`)
-" Last Updated: Thu Mar  5 18:17:47 2020
+" Last Updated: Sun Mar 22 08:25:00 2020
 
 " Generated by Colortemplate v2.0.0
 
@@ -41,7 +41,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     endif
     hi Normal guifg=#b9b9b9 guibg=#181818 guisp=NONE gui=NONE cterm=NONE
     hi IncSearch guifg=#ed4a46 guibg=NONE guisp=NONE gui=reverse cterm=reverse
-    hi Search guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search guifg=#dbb32d guibg=NONE guisp=NONE gui=reverse cterm=reverse
     hi Visual guifg=NONE guibg=#3b3b3b guisp=NONE gui=NONE cterm=NONE
     hi LineNr guifg=#777777 guibg=#252525 guisp=NONE gui=NONE cterm=NONE
     hi CursorLineNr guifg=#dedede guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -66,17 +66,24 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi! link StatusLineTermNC StatusLineNC
     hi! link lCursor Cursor
     hi Comment guifg=#777777 guibg=NONE guisp=NONE gui=italic cterm=italic
-    hi Constant guifg=#ed4a46 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi String guifg=#70b433 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Statement guifg=#efc541 guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Identifier guifg=#eb6eb7 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi PreProc guifg=#368aeb guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Special guifg=#368aeb guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Constant guifg=#3fc5b7 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Identifier guifg=#4f9cfe guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Statement guifg=#efc541 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi PreProc guifg=#eb6eb7 guibg=NONE guisp=NONE gui=NONE cterm=NONE
     hi Type guifg=#70b433 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Special guifg=#ed4a46 guibg=NONE guisp=NONE gui=NONE cterm=NONE
     hi Error guifg=#ed4a46 guibg=NONE guisp=NONE gui=bold cterm=bold
-    hi Todo guifg=#efc541 guibg=#252525 guisp=NONE gui=reverse cterm=reverse
+    hi Todo guifg=#eb6eb7 guibg=#252525 guisp=NONE gui=bold,reverse cterm=bold,reverse
     hi Underlined guifg=#368aeb guibg=NONE guisp=NONE gui=underline cterm=underline
+    if !s:italics
+      hi Comment gui=NONE cterm=NONE
+    endif
+    if get(g:, 'selenized_green_keywords', 0)
+      hi Statement guifg=#70b433 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+      hi Type guifg=#dbb32d guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    endif
     hi! link Function Identifier
+    hi! link String Constant
     hi! link Number Constant
     hi! link Boolean Constant
     hi! link Character Constant
@@ -99,6 +106,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi! link StorageClass Type
     hi! link Structure Type
     hi! link Typedef Type
+    hi! link VimCommand Statement
     hi Terminal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -126,9 +134,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi WarningMsg guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WildMenu guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-    if !s:italics
-      hi Comment gui=NONE cterm=NONE
-    endif
     unlet s:t_Co s:italics
     finish
   endif
@@ -156,7 +161,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   endif
   hi Normal guifg=#474747 guibg=#ffffff guisp=NONE gui=NONE cterm=NONE
   hi IncSearch guifg=#d6000c guibg=NONE guisp=NONE gui=reverse cterm=reverse
-  hi Search guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Search guifg=#c49700 guibg=NONE guisp=NONE gui=reverse cterm=reverse
   hi Visual guifg=NONE guibg=#cdcdcd guisp=NONE gui=NONE cterm=NONE
   hi LineNr guifg=#878787 guibg=#ebebeb guisp=NONE gui=NONE cterm=NONE
   hi CursorLineNr guifg=#282828 guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -181,17 +186,24 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi! link StatusLineTermNC StatusLineNC
   hi! link lCursor Cursor
   hi Comment guifg=#878787 guibg=NONE guisp=NONE gui=italic cterm=italic
-  hi Constant guifg=#d6000c guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi String guifg=#1d9700 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#af8500 guibg=NONE guisp=NONE gui=bold cterm=bold
-  hi Identifier guifg=#dd0f9d guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#0064e4 guibg=NONE guisp=NONE gui=bold cterm=bold
-  hi Special guifg=#0064e4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#00ad9c guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=#0054cf guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#af8500 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#dd0f9d guibg=NONE guisp=NONE gui=NONE cterm=NONE
   hi Type guifg=#1d9700 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  hi Special guifg=#d6000c guibg=NONE guisp=NONE gui=NONE cterm=NONE
   hi Error guifg=#d6000c guibg=NONE guisp=NONE gui=bold cterm=bold
-  hi Todo guifg=#af8500 guibg=#ebebeb guisp=NONE gui=reverse cterm=reverse
+  hi Todo guifg=#dd0f9d guibg=#ebebeb guisp=NONE gui=bold,reverse cterm=bold,reverse
   hi Underlined guifg=#0064e4 guibg=NONE guisp=NONE gui=underline cterm=underline
+  if !s:italics
+    hi Comment gui=NONE cterm=NONE
+  endif
+  if get(g:, 'selenized_green_keywords', 0)
+    hi Statement guifg=#1d9700 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+    hi Type guifg=#c49700 guibg=NONE guisp=NONE gui=NONE cterm=NONE
+  endif
   hi! link Function Identifier
+  hi! link String Constant
   hi! link Number Constant
   hi! link Boolean Constant
   hi! link Character Constant
@@ -214,6 +226,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi! link StorageClass Type
   hi! link Structure Type
   hi! link Typedef Type
+  hi! link VimCommand Statement
   hi Terminal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Conceal guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -241,9 +254,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi WarningMsg guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi WildMenu guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  if !s:italics
-    hi Comment gui=NONE cterm=NONE
-  endif
   unlet s:t_Co s:italics
   finish
 endif
@@ -255,7 +265,7 @@ if s:t_Co >= 256
       set background=dark
     endif
     hi IncSearch ctermfg=203 ctermbg=NONE cterm=reverse
-    hi Search ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=178 ctermbg=NONE cterm=reverse
     hi Visual ctermfg=NONE ctermbg=237 cterm=NONE
     hi LineNr ctermfg=243 ctermbg=235 cterm=NONE
     hi CursorLineNr ctermfg=253 ctermbg=NONE cterm=NONE
@@ -280,17 +290,24 @@ if s:t_Co >= 256
     hi! link StatusLineTermNC StatusLineNC
     hi! link lCursor Cursor
     hi Comment ctermfg=243 ctermbg=NONE cterm=italic
-    hi Constant ctermfg=203 ctermbg=NONE cterm=NONE
-    hi String ctermfg=70 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=178 ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=205 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=33 ctermbg=NONE cterm=bold
-    hi Special ctermfg=33 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=44 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=39 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=178 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=205 ctermbg=NONE cterm=NONE
     hi Type ctermfg=70 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=203 ctermbg=NONE cterm=NONE
     hi Error ctermfg=203 ctermbg=NONE cterm=bold
-    hi Todo ctermfg=178 ctermbg=235 cterm=reverse
+    hi Todo ctermfg=205 ctermbg=235 cterm=bold,reverse
     hi Underlined ctermfg=33 ctermbg=NONE cterm=underline
+    if !s:italics
+      hi Comment cterm=NONE
+    endif
+    if get(g:, 'selenized_green_keywords', 0)
+      hi Statement ctermfg=70 ctermbg=NONE cterm=NONE
+      hi Type ctermfg=178 ctermbg=NONE cterm=NONE
+    endif
     hi! link Function Identifier
+    hi! link String Constant
     hi! link Number Constant
     hi! link Boolean Constant
     hi! link Character Constant
@@ -313,6 +330,7 @@ if s:t_Co >= 256
     hi! link StorageClass Type
     hi! link Structure Type
     hi! link Typedef Type
+    hi! link VimCommand Statement
     hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -340,16 +358,13 @@ if s:t_Co >= 256
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    if !s:italics
-      hi Comment cterm=NONE
-    endif
     unlet s:t_Co s:italics
     finish
   endif
   " Light background
   hi Normal ctermfg=238 ctermbg=231 cterm=NONE
   hi IncSearch ctermfg=160 ctermbg=NONE cterm=reverse
-  hi Search ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Search ctermfg=136 ctermbg=NONE cterm=reverse
   hi Visual ctermfg=NONE ctermbg=252 cterm=NONE
   hi LineNr ctermfg=102 ctermbg=255 cterm=NONE
   hi CursorLineNr ctermfg=235 ctermbg=NONE cterm=NONE
@@ -374,17 +389,24 @@ if s:t_Co >= 256
   hi! link StatusLineTermNC StatusLineNC
   hi! link lCursor Cursor
   hi Comment ctermfg=102 ctermbg=NONE cterm=italic
-  hi Constant ctermfg=160 ctermbg=NONE cterm=NONE
-  hi String ctermfg=28 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=136 ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=163 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=26 ctermbg=NONE cterm=bold
-  hi Special ctermfg=26 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=37 ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=26 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=136 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=163 ctermbg=NONE cterm=NONE
   hi Type ctermfg=28 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=160 ctermbg=NONE cterm=NONE
   hi Error ctermfg=160 ctermbg=NONE cterm=bold
-  hi Todo ctermfg=136 ctermbg=255 cterm=reverse
+  hi Todo ctermfg=163 ctermbg=255 cterm=bold,reverse
   hi Underlined ctermfg=26 ctermbg=NONE cterm=underline
+  if !s:italics
+    hi Comment cterm=NONE
+  endif
+  if get(g:, 'selenized_green_keywords', 0)
+    hi Statement ctermfg=28 ctermbg=NONE cterm=NONE
+    hi Type ctermfg=136 ctermbg=NONE cterm=NONE
+  endif
   hi! link Function Identifier
+  hi! link String Constant
   hi! link Number Constant
   hi! link Boolean Constant
   hi! link Character Constant
@@ -407,6 +429,7 @@ if s:t_Co >= 256
   hi! link StorageClass Type
   hi! link Structure Type
   hi! link Typedef Type
+  hi! link VimCommand Statement
   hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -434,9 +457,6 @@ if s:t_Co >= 256
   hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  if !s:italics
-    hi Comment cterm=NONE
-  endif
   unlet s:t_Co s:italics
   finish
 endif
@@ -445,7 +465,7 @@ if s:t_Co >= 16
   if &background ==# 'dark'
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi IncSearch ctermfg=DarkRed ctermbg=NONE cterm=reverse
-    hi Search ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=DarkYellow ctermbg=NONE cterm=reverse
     hi Visual ctermfg=NONE ctermbg=DarkGrey cterm=NONE
     hi LineNr ctermfg=LightGrey ctermbg=Black cterm=NONE
     hi CursorLineNr ctermfg=White ctermbg=NONE cterm=NONE
@@ -470,17 +490,24 @@ if s:t_Co >= 16
     hi! link StatusLineTermNC StatusLineNC
     hi! link lCursor Cursor
     hi Comment ctermfg=LightGrey ctermbg=NONE cterm=italic
-    hi Constant ctermfg=DarkRed ctermbg=NONE cterm=NONE
-    hi String ctermfg=DarkGreen ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=LightYellow ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=DarkBlue ctermbg=NONE cterm=bold
-    hi Special ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=LightBlue ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=LightYellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
     hi Type ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi Special ctermfg=DarkRed ctermbg=NONE cterm=NONE
     hi Error ctermfg=DarkRed ctermbg=NONE cterm=bold
-    hi Todo ctermfg=LightYellow ctermbg=Black cterm=reverse
+    hi Todo ctermfg=DarkMagenta ctermbg=Black cterm=bold,reverse
     hi Underlined ctermfg=DarkBlue ctermbg=NONE cterm=underline
+    if !s:italics
+      hi Comment cterm=NONE
+    endif
+    if get(g:, 'selenized_green_keywords', 0)
+      hi Statement ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+      hi Type ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+    endif
     hi! link Function Identifier
+    hi! link String Constant
     hi! link Number Constant
     hi! link Boolean Constant
     hi! link Character Constant
@@ -503,6 +530,7 @@ if s:t_Co >= 16
     hi! link StorageClass Type
     hi! link Structure Type
     hi! link Typedef Type
+    hi! link VimCommand Statement
     hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -530,16 +558,13 @@ if s:t_Co >= 16
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    if !s:italics
-      hi Comment cterm=NONE
-    endif
     unlet s:t_Co s:italics
     finish
   endif
   " Light background
   hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi IncSearch ctermfg=DarkRed ctermbg=NONE cterm=reverse
-  hi Search ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Search ctermfg=DarkYellow ctermbg=NONE cterm=reverse
   hi Visual ctermfg=NONE ctermbg=DarkGrey cterm=NONE
   hi LineNr ctermfg=LightGrey ctermbg=Black cterm=NONE
   hi CursorLineNr ctermfg=White ctermbg=NONE cterm=NONE
@@ -564,17 +589,24 @@ if s:t_Co >= 16
   hi! link StatusLineTermNC StatusLineNC
   hi! link lCursor Cursor
   hi Comment ctermfg=LightGrey ctermbg=NONE cterm=italic
-  hi Constant ctermfg=DarkRed ctermbg=NONE cterm=NONE
-  hi String ctermfg=DarkGreen ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=LightYellow ctermbg=NONE cterm=bold
-  hi Identifier ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=DarkBlue ctermbg=NONE cterm=bold
-  hi Special ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=LightBlue ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=LightYellow ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
   hi Type ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+  hi Special ctermfg=DarkRed ctermbg=NONE cterm=NONE
   hi Error ctermfg=DarkRed ctermbg=NONE cterm=bold
-  hi Todo ctermfg=LightYellow ctermbg=Black cterm=reverse
+  hi Todo ctermfg=DarkMagenta ctermbg=Black cterm=bold,reverse
   hi Underlined ctermfg=DarkBlue ctermbg=NONE cterm=underline
+  if !s:italics
+    hi Comment cterm=NONE
+  endif
+  if get(g:, 'selenized_green_keywords', 0)
+    hi Statement ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+    hi Type ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+  endif
   hi! link Function Identifier
+  hi! link String Constant
   hi! link Number Constant
   hi! link Boolean Constant
   hi! link Character Constant
@@ -597,6 +629,7 @@ if s:t_Co >= 16
   hi! link StorageClass Type
   hi! link Structure Type
   hi! link Typedef Type
+  hi! link VimCommand Statement
   hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -624,9 +657,6 @@ if s:t_Co >= 16
   hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE
   hi WildMenu ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  if !s:italics
-    hi Comment cterm=NONE
-  endif
   unlet s:t_Co s:italics
   finish
 endif
diff --git a/vim/selenized_black_white.colortemplate b/vim/selenized_black_white.colortemplate
index 7527d10..6ec7e35 100644
--- a/vim/selenized_black_white.colortemplate
+++ b/vim/selenized_black_white.colortemplate
@@ -5,6 +5,7 @@ Full name:     Selenized black/white, beta version
 Short name:    selenized_bw
 Author:        Jan Warchoł <jan.warchol@gmail.com>
 Neovim:        yes
+Option Prefix: selenized
 # }}}
 
 Background: dark
diff --git a/vim/selenized_dark_light.colortemplate b/vim/selenized_dark_light.colortemplate
index c1a6cf1..09195c1 100644
--- a/vim/selenized_dark_light.colortemplate
+++ b/vim/selenized_dark_light.colortemplate
@@ -5,6 +5,7 @@ Full name:     Selenized dark/light, beta version
 Short name:    selenized
 Author:        Jan Warchoł <jan.warchol@gmail.com>
 Neovim:        yes
+Option Prefix: selenized
 # }}}
 
 Background: dark