diff --git a/buildSrc/assets/templates/.doki-theme.v2.colors.template.vim.swp b/buildSrc/assets/templates/.doki-theme.v2.colors.template.vim.swp
new file mode 100644
index 0000000..2791155
Binary files /dev/null and b/buildSrc/assets/templates/.doki-theme.v2.colors.template.vim.swp differ
diff --git a/buildSrc/assets/templates/doki-theme.v2.colors.template.vim b/buildSrc/assets/templates/doki-theme.v2.colors.template.vim
index 1bdd4aa..0cfe0d9 100644
--- a/buildSrc/assets/templates/doki-theme.v2.colors.template.vim
+++ b/buildSrc/assets/templates/doki-theme.v2.colors.template.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/aqua.vim b/colors/aqua.vim
index 0960b98..83bccc2 100644
--- a/colors/aqua.vim
+++ b/colors/aqua.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/astolfo.vim b/colors/astolfo.vim
index 99de2ad..2048a92 100644
--- a/colors/astolfo.vim
+++ b/colors/astolfo.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/asuna_dark.vim b/colors/asuna_dark.vim
index 417b188..aa45de6 100644
--- a/colors/asuna_dark.vim
+++ b/colors/asuna_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/asuna_light.vim b/colors/asuna_light.vim
index bd43901..4fc2ea3 100644
--- a/colors/asuna_light.vim
+++ b/colors/asuna_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/azuki.vim b/colors/azuki.vim
index 696cfc8..94accc3 100644
--- a/colors/azuki.vim
+++ b/colors/azuki.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/beatrice.vim b/colors/beatrice.vim
index 70f70b0..802ceb9 100644
--- a/colors/beatrice.vim
+++ b/colors/beatrice.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/chocola.vim b/colors/chocola.vim
index afb2978..f53d423 100644
--- a/colors/chocola.vim
+++ b/colors/chocola.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/christmas_chocola.vim b/colors/christmas_chocola.vim
index 9c5cd37..653cc2b 100644
--- a/colors/christmas_chocola.vim
+++ b/colors/christmas_chocola.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/cinnamon.vim b/colors/cinnamon.vim
index 1c172f2..0144270 100644
--- a/colors/cinnamon.vim
+++ b/colors/cinnamon.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/coconut.vim b/colors/coconut.vim
index d6bb29d..b384480 100644
--- a/colors/coconut.vim
+++ b/colors/coconut.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/darkness_dark.vim b/colors/darkness_dark.vim
index 3be77fd..8406201 100644
--- a/colors/darkness_dark.vim
+++ b/colors/darkness_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/darkness_light.vim b/colors/darkness_light.vim
index 99335da..d0a61df 100644
--- a/colors/darkness_light.vim
+++ b/colors/darkness_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/echidna.vim b/colors/echidna.vim
index f1e6006..3699eb1 100644
--- a/colors/echidna.vim
+++ b/colors/echidna.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/emilia_dark.vim b/colors/emilia_dark.vim
index 25f2734..d010152 100644
--- a/colors/emilia_dark.vim
+++ b/colors/emilia_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/emilia_light.vim b/colors/emilia_light.vim
index 660ceeb..d2a2ce0 100644
--- a/colors/emilia_light.vim
+++ b/colors/emilia_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/essex.vim b/colors/essex.vim
index 9586d96..cd677d1 100644
--- a/colors/essex.vim
+++ b/colors/essex.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/gasai_yuno.vim b/colors/gasai_yuno.vim
index 7b177d5..14bea07 100644
--- a/colors/gasai_yuno.vim
+++ b/colors/gasai_yuno.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/gray.vim b/colors/gray.vim
index a7c59c2..564ec68 100644
--- a/colors/gray.vim
+++ b/colors/gray.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/hanekawa_tsubasa.vim b/colors/hanekawa_tsubasa.vim
index d1e025d..72823f8 100644
--- a/colors/hanekawa_tsubasa.vim
+++ b/colors/hanekawa_tsubasa.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/hatsune_miku.vim b/colors/hatsune_miku.vim
index 5e7f692..4b44b51 100644
--- a/colors/hatsune_miku.vim
+++ b/colors/hatsune_miku.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/hayase_nagatoro.vim b/colors/hayase_nagatoro.vim
index 21b33ea..6bc485f 100644
--- a/colors/hayase_nagatoro.vim
+++ b/colors/hayase_nagatoro.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/ishtar_dark.vim b/colors/ishtar_dark.vim
index 6687f04..5b45825 100644
--- a/colors/ishtar_dark.vim
+++ b/colors/ishtar_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/ishtar_light.vim b/colors/ishtar_light.vim
index 52cdf4e..bed2bf5 100644
--- a/colors/ishtar_light.vim
+++ b/colors/ishtar_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/jabami_yumeko.vim b/colors/jabami_yumeko.vim
index b549375..9a4cd2a 100644
--- a/colors/jabami_yumeko.vim
+++ b/colors/jabami_yumeko.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/jahy.vim b/colors/jahy.vim
index 12aaa47..a050c00 100644
--- a/colors/jahy.vim
+++ b/colors/jahy.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/kanna.vim b/colors/kanna.vim
index 5a0ee96..e7f120d 100644
--- a/colors/kanna.vim
+++ b/colors/kanna.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/katsuragi_misato.vim b/colors/katsuragi_misato.vim
index 7034e33..4d448cf 100644
--- a/colors/katsuragi_misato.vim
+++ b/colors/katsuragi_misato.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/kirino.vim b/colors/kirino.vim
index 71b0bea..0bf5e86 100644
--- a/colors/kirino.vim
+++ b/colors/kirino.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/konata.vim b/colors/konata.vim
index c5b1a3c..302206d 100644
--- a/colors/konata.vim
+++ b/colors/konata.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/mai_dark.vim b/colors/mai_dark.vim
index 88ee42f..4d2c102 100644
--- a/colors/mai_dark.vim
+++ b/colors/mai_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/mai_light.vim b/colors/mai_light.vim
index 8ec8eff..ba5be0d 100644
--- a/colors/mai_light.vim
+++ b/colors/mai_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/maika.vim b/colors/maika.vim
index a160323..6e5b9cd 100644
--- a/colors/maika.vim
+++ b/colors/maika.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/makise_kurisu.vim b/colors/makise_kurisu.vim
index 782e301..a1f98c0 100644
--- a/colors/makise_kurisu.vim
+++ b/colors/makise_kurisu.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/maple_dark.vim b/colors/maple_dark.vim
index 948b06e..d90f4c8 100644
--- a/colors/maple_dark.vim
+++ b/colors/maple_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/maple_light.vim b/colors/maple_light.vim
index f5c7a8d..6b8ac37 100644
--- a/colors/maple_light.vim
+++ b/colors/maple_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/megumin.vim b/colors/megumin.vim
index efbc451..bb6fa4a 100644
--- a/colors/megumin.vim
+++ b/colors/megumin.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/miia.vim b/colors/miia.vim
index 343f249..0e317f5 100644
--- a/colors/miia.vim
+++ b/colors/miia.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/mioda_ibuki_dark.vim b/colors/mioda_ibuki_dark.vim
index 12ba1e8..62ce19e 100644
--- a/colors/mioda_ibuki_dark.vim
+++ b/colors/mioda_ibuki_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/mioda_ibuki_light.vim b/colors/mioda_ibuki_light.vim
index 178abc5..dd6bedc 100644
--- a/colors/mioda_ibuki_light.vim
+++ b/colors/mioda_ibuki_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/monika_dark.vim b/colors/monika_dark.vim
index 1beaf4d..5ca098c 100644
--- a/colors/monika_dark.vim
+++ b/colors/monika_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/monika_light.vim b/colors/monika_light.vim
index 17de6b7..9534b79 100644
--- a/colors/monika_light.vim
+++ b/colors/monika_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/nakano_miku.vim b/colors/nakano_miku.vim
index 9b1754b..8c82997 100644
--- a/colors/nakano_miku.vim
+++ b/colors/nakano_miku.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/nakano_nino.vim b/colors/nakano_nino.vim
index 2ccb9b2..65ce8ee 100644
--- a/colors/nakano_nino.vim
+++ b/colors/nakano_nino.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/nakano_yotsuba.vim b/colors/nakano_yotsuba.vim
index 80a96a4..e18c1f0 100644
--- a/colors/nakano_yotsuba.vim
+++ b/colors/nakano_yotsuba.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/natsuki_dark.vim b/colors/natsuki_dark.vim
index 5e3fe3b..94b7ad6 100644
--- a/colors/natsuki_dark.vim
+++ b/colors/natsuki_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/natsuki_light.vim b/colors/natsuki_light.vim
index c554e2f..20f6fbe 100644
--- a/colors/natsuki_light.vim
+++ b/colors/natsuki_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/ram.vim b/colors/ram.vim
index da96fb0..00f8f1f 100644
--- a/colors/ram.vim
+++ b/colors/ram.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/rei.vim b/colors/rei.vim
index 1a376d0..1367c90 100644
--- a/colors/rei.vim
+++ b/colors/rei.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/rem.vim b/colors/rem.vim
index ca75233..9b8da42 100644
--- a/colors/rem.vim
+++ b/colors/rem.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/rias_crimson.vim b/colors/rias_crimson.vim
index aa92049..c2edc7f 100644
--- a/colors/rias_crimson.vim
+++ b/colors/rias_crimson.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/rias_onyx.vim b/colors/rias_onyx.vim
index fa8d71f..f88c78c 100644
--- a/colors/rias_onyx.vim
+++ b/colors/rias_onyx.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/rory_mercury.vim b/colors/rory_mercury.vim
index 95dcdc6..834df82 100644
--- a/colors/rory_mercury.vim
+++ b/colors/rory_mercury.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/ryuko_dark.vim b/colors/ryuko_dark.vim
index 7ea8426..da6aefb 100644
--- a/colors/ryuko_dark.vim
+++ b/colors/ryuko_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/ryuko_light.vim b/colors/ryuko_light.vim
index fc7168b..3eba544 100644
--- a/colors/ryuko_light.vim
+++ b/colors/ryuko_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/sagiri.vim b/colors/sagiri.vim
index 3880bdf..31a22f8 100644
--- a/colors/sagiri.vim
+++ b/colors/sagiri.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/satsuki_dark.vim b/colors/satsuki_dark.vim
index 46ab872..3a147ec 100644
--- a/colors/satsuki_dark.vim
+++ b/colors/satsuki_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/satsuki_light.vim b/colors/satsuki_light.vim
index 8ced16b..2554234 100644
--- a/colors/satsuki_light.vim
+++ b/colors/satsuki_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/sayori_dark.vim b/colors/sayori_dark.vim
index 3a82833..865f0a5 100644
--- a/colors/sayori_dark.vim
+++ b/colors/sayori_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/sayori_light.vim b/colors/sayori_light.vim
index 9f72744..57d5a2a 100644
--- a/colors/sayori_light.vim
+++ b/colors/sayori_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/shigure.vim b/colors/shigure.vim
index 19cf86d..521fc1a 100644
--- a/colors/shigure.vim
+++ b/colors/shigure.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/shima_rin.vim b/colors/shima_rin.vim
index 87d546f..41eab43 100644
--- a/colors/shima_rin.vim
+++ b/colors/shima_rin.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/sonoda_umi.vim b/colors/sonoda_umi.vim
index c58a869..07a5dd4 100644
--- a/colors/sonoda_umi.vim
+++ b/colors/sonoda_umi.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/tohru.vim b/colors/tohru.vim
index a73736e..d91e704 100644
--- a/colors/tohru.vim
+++ b/colors/tohru.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/tohsaka_rin.vim b/colors/tohsaka_rin.vim
index d45cfa3..e51c504 100644
--- a/colors/tohsaka_rin.vim
+++ b/colors/tohsaka_rin.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/vanilla.vim b/colors/vanilla.vim
index 08a835b..00287bb 100644
--- a/colors/vanilla.vim
+++ b/colors/vanilla.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/yukinoshita_yukino.vim b/colors/yukinoshita_yukino.vim
index d0c51ce..e398e20 100644
--- a/colors/yukinoshita_yukino.vim
+++ b/colors/yukinoshita_yukino.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/yuri_dark.vim b/colors/yuri_dark.vim
index a265b53..ad70d31 100644
--- a/colors/yuri_dark.vim
+++ b/colors/yuri_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/yuri_light.vim b/colors/yuri_light.vim
index 38ce382..99cb1c3 100644
--- a/colors/yuri_light.vim
+++ b/colors/yuri_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/zero_two_dark.vim b/colors/zero_two_dark.vim
index 96ac6e0..5d4ea42 100644
--- a/colors/zero_two_dark.vim
+++ b/colors/zero_two_dark.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})
diff --git a/colors/zero_two_light.vim b/colors/zero_two_light.vim
index 65ad8cb..61935c8 100644
--- a/colors/zero_two_light.vim
+++ b/colors/zero_two_light.vim
@@ -112,6 +112,16 @@ call s:h("xmlCdataStart", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataEnd", { "fg": s:colors.keywordColor})
 call s:h("xmlCdataCdata", { "fg": s:colors.keywordColor})
 
+" Vim
+call s:h("vimOption", { "fg": s:colors.keyColor})
+call s:h("vimFuncName", { "fg": s:colors.editorAccentColor})
+call s:h("vimUserFunc", { "fg": s:colors.editorAccentColor})
+call s:h("vimParenSep", { "fg": s:colors.foregroundColorEditor})
+call s:h("vimCommand", { "fg": s:colors.keywordColor})
+call s:h("vimLet", { "fg": s:colors.keywordColor})
+call s:h("vimNotFunc", { "fg": s:colors.keywordColor})
+call s:h("vimIsCommand", { "fg": s:colors.classNameColor})
+
 " HTML
 call s:h("htmlTagName", { "fg": s:colors.htmlTagColor})
 call s:h("htmlEndTag", { "fg": s:colors.htmlTagColor})