diff --git a/colors/vim-monokai-tasty.vim b/colors/vim-monokai-tasty.vim
index d372744..3d7f917 100644
--- a/colors/vim-monokai-tasty.vim
+++ b/colors/vim-monokai-tasty.vim
@@ -60,196 +60,197 @@ let s:bold = { "cterm": "bold", "gui": "bold" }
 let s:underline = { "cterm": "underline", "gui": "underline" }
 let s:bold_underline = { "cterm": "bold,underline", "gui": "bold,underline" }
 
-function! Highlight(group, fg, bg, style)
-  exec "hi " . a:group
-        \ . " ctermfg=" . a:fg["cterm"]
-        \ . " ctermbg=" . a:bg["cterm"]
-        \ . " cterm=" . a:style["cterm"]
-        \ . " guifg=" . a:fg["gui"]
-        \ . " guibg=" . a:bg["gui"]
-        \ . " gui=" . a:style["gui"]
+function! Highlight(group, colour)
+  let l:foreground = exists('a:colour.fg')
+        \ ? ' ctermfg=' . a:colour.fg.cterm . ' guifg=' . a:colour.fg.gui
+        \ : ''
+  let l:background = exists('a:colour.bg')
+        \ ? ' ctermbg=' . a:colour.bg.cterm . ' guibg=' . a:colour.bg.gui
+        \ : ''
+  let l:style = exists('a:colour.style')
+        \ ? ' cterm=' . a:colour.style.cterm . ' gui=' . a:colour.style.gui
+        \ : ''
+  let l:highlight_command = 'hi '
+        \ . a:group . l:foreground . l:background . l:style
+  exec l:highlight_command
 endfunction
 
-call Highlight("Normal", s:white, s:charcoal, s:none)
+call Highlight("Normal", { 'fg': s:white, 'bg': s:charcoal, 'style': s:none })
+call Highlight("Cursor", { 'fg': s:charcoal, 'bg': s:light_blue, 'style': s:none })
+call Highlight("Special", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("Title", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
 
-call Highlight("Cursor", s:charcoal, s:light_blue, s:none)
-call Highlight("Special", s:purple, s:none, s:none)
-call Highlight("Title", s:white, s:none, s:bold)
+call Highlight("Error", { 'fg': s:white, 'bg': s:danger, 'style': s:none })
+call Highlight("ErrorMsg", { 'fg': s:white, 'bg': s:danger, 'style': s:none })
+call Highlight("WarningMsg", { 'fg': s:white, 'bg': s:danger, 'style': s:none })
+call Highlight("SpellBad", { 'fg': s:white, 'bg': s:danger, 'style': s:none })
+call Highlight("SpellRare", { 'fg': s:white, 'bg': s:danger, 'style': s:none })
+call Highlight("SpellCap", { 'fg': s:charcoal, 'bg': s:orange, 'style': s:italic })
+call Highlight("SpellLocal", { 'fg': s:charcoal, 'bg': s:orange, 'style': s:italic })
 
-call Highlight("Error", s:white, s:danger, s:none)
-call Highlight("ErrorMsg", s:white, s:danger, s:none)
-call Highlight("WarningMsg", s:white, s:danger, s:none)
-call Highlight("SpellBad", s:white, s:danger, s:none)
-call Highlight("SpellRare", s:white, s:danger, s:none)
-call Highlight("SpellCap", s:charcoal, s:orange, s:italic)
-call Highlight("SpellLocal", s:charcoal, s:orange, s:italic)
+call Highlight("CursorLineNR", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
 
-call Highlight("CursorLineNR", s:yellow, s:none, s:none)
-
-call Highlight("CursorColumn", s:none, s:darker_grey, s:none)
-call Highlight("ColorColumn", s:none, s:light_charcoal, s:none)
-call Highlight("Conceal", s:none, s:none, s:none)
-call Highlight("CursorLine", s:none, s:darker_grey, s:none)
-call Highlight("Type", s:none, s:none, s:none)
+call Highlight("CursorColumn", { 'fg': s:none, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("ColorColumn", { 'fg': s:none, 'bg': s:light_charcoal, 'style': s:none })
+call Highlight("Conceal", { 'fg': s:none, 'bg': s:none, 'style': s:none })
+call Highlight("CursorLine", { 'fg': s:none, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("Type", { 'fg': s:none, 'bg': s:none, 'style': s:none })
 
 " quickfix window
-call Highlight("qfFileName", s:purple, s:none, s:none)
-call Highlight("qfLineNr", s:light_blue, s:none, s:none)
-call Highlight("qfSeparator", s:light_grey, s:none, s:none)
-call Highlight("QuickFixLine", s:light_green, s:light_charcoal, s:bold)
+call Highlight("qfFileName", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("qfLineNr", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("qfSeparator", { 'fg': s:light_grey, 'bg': s:none, 'style': s:none })
+call Highlight("QuickFixLine", { 'fg': s:light_green, 'bg': s:light_charcoal, 'style': s:bold })
 
-call Highlight("Visual", s:none, s:dark_grey, s:none)
-call Highlight("TabLine", s:light_grey, s:dark_grey, s:underline)
-call Highlight("Whitespace", s:dark_grey, s:none, s:none)
+call Highlight("Visual", { 'fg': s:none, 'bg': s:dark_grey, 'style': s:none })
+call Highlight("TabLine", { 'fg': s:light_grey, 'bg': s:dark_grey, 'style': s:underline })
+call Highlight("Whitespace", { 'fg': s:dark_grey, 'bg': s:none, 'style': s:none })
 
-call Highlight("TabLineSel", s:none, s:charcoal, s:bold)
+call Highlight("TabLineSel", { 'fg': s:none, 'bg': s:charcoal, 'style': s:bold })
 
-call Highlight("SignColumn", s:none, s:none, s:none)
-call Highlight("NonText", s:darker_grey, s:none, s:none)
-call Highlight("TabLineFill", s:none, s:darker_grey, s:none)
-call Highlight("LineNr", s:dark_grey, s:none, s:none)
-call Highlight("VertSplit", s:darker_grey, s:charcoal, s:none)
-call Highlight("StatusLine", s:white, s:dark_grey, s:none)
-call Highlight("StatusLineNC", s:light_grey, s:darker_grey, s:none)
+call Highlight("SignColumn", { 'fg': s:none, 'bg': s:none, 'style': s:none })
+call Highlight("NonText", { 'fg': s:darker_grey, 'bg': s:none, 'style': s:none })
+call Highlight("TabLineFill", { 'fg': s:none, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("LineNr", { 'fg': s:dark_grey, 'bg': s:none, 'style': s:none })
+call Highlight("VertSplit", { 'fg': s:darker_grey, 'bg': s:charcoal, 'style': s:none })
+call Highlight("StatusLine", { 'fg': s:light_grey, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLineNC", { 'fg': s:light_grey, 'bg': s:darker_grey, 'style': s:none })
 
-call Highlight("StatusLineBase", s:white, s:darker_grey, s:none)
-call Highlight("StatusLineGitBranch", s:white, s:dark_grey, s:italic)
-call Highlight("StatusLineModifiedFile", s:orange, s:darker_grey, s:none)
-call Highlight("StatusLineReadOnlyFile", s:grey, s:darker_grey, s:none)
-call Highlight("StatusLine", s:darker_grey, s:light_grey, s:none)
-call Highlight("StatusLineSeparatorGitBranch", s:dark_grey, s:darker_grey, s:none)
-call Highlight("StatusLineSeparatorNormalDark", s:light_green, s:dark_grey, s:none)
-call Highlight("StatusLineSeparatorVisualDark", s:purple, s:dark_grey, s:none)
-call Highlight("StatusLineSeparatorInsertDark", s:yellow, s:dark_grey, s:none)
-call Highlight("StatusLineSeparatorCommandDark", s:light_blue, s:dark_grey, s:none)
-call Highlight("StatusLineSeparatorNormal", s:light_green, s:darker_grey, s:none)
-call Highlight("StatusLineSeparatorVisual", s:purple, s:darker_grey, s:none)
-call Highlight("StatusLineSeparatorInsert", s:yellow, s:darker_grey, s:none)
-call Highlight("StatusLineSeparatorCommand", s:light_blue, s:darker_grey, s:none)
-call Highlight("StatusLineNormalMode", s:charcoal, s:light_green, s:bold)
-call Highlight("StatusLineVisualMode", s:charcoal, s:purple, s:bold)
-call Highlight("StatusLineInsertMode", s:charcoal, s:yellow, s:bold)
-call Highlight("StatusLineCommandMode", s:charcoal, s:light_blue, s:bold)
+call Highlight("StatusLineBase", { 'fg': s:white, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLineGitBranch", { 'fg': s:white, 'bg': s:dark_grey, 'style': s:italic })
+call Highlight("StatusLineModifiedFile", { 'fg': s:orange, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLineReadOnlyFile", { 'fg': s:grey, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLine", { 'fg': s:darker_grey, 'bg': s:light_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorGitBranch", { 'fg': s:dark_grey, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorNormalDark", { 'fg': s:light_green, 'bg': s:dark_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorVisualDark", { 'fg': s:purple, 'bg': s:dark_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorInsertDark", { 'fg': s:yellow, 'bg': s:dark_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorCommandDark", { 'fg': s:light_blue, 'bg': s:dark_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorNormal", { 'fg': s:light_green, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorVisual", { 'fg': s:purple, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorInsert", { 'fg': s:yellow, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLineSeparatorCommand", { 'fg': s:light_blue, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("StatusLineNormalMode", { 'fg': s:charcoal, 'bg': s:light_green, 'style': s:bold })
+call Highlight("StatusLineVisualMode", { 'fg': s:charcoal, 'bg': s:purple, 'style': s:bold })
+call Highlight("StatusLineInsertMode", { 'fg': s:charcoal, 'bg': s:yellow, 'style': s:bold })
+call Highlight("StatusLineCommandMode", { 'fg': s:charcoal, 'bg': s:light_blue, 'style': s:bold })
 
-call Highlight("Exception", s:magenta, s:none, s:bold)
-call Highlight("MatchParen", s:magenta, s:none, s:bold_underline)
-call Highlight("Include", s:magenta, s:none, s:none)
-call Highlight("Conditional", s:magenta, s:none, s:none)
-call Highlight("Define", s:magenta, s:none, s:none)
-call Highlight("Debug", s:magenta, s:none, s:none)
-call Highlight("Delimiter", s:magenta, s:none, s:none)
-call Highlight("Keyword", s:magenta, s:none, s:none)
-call Highlight("Macro", s:magenta, s:none, s:none)
-call Highlight("Operator", s:magenta, s:none, s:none)
-call Highlight("PreProc", s:magenta, s:none, s:none)
-call Highlight("Statement", s:magenta, s:none, s:none)
-call Highlight("Repeat", s:magenta, s:none, s:none)
+call Highlight("Exception", { 'fg': s:magenta, 'bg': s:none, 'style': s:bold })
+call Highlight("MatchParen", { 'fg': s:magenta, 'bg': s:none, 'style': s:bold_underline })
+call Highlight("Include", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Conditional", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Define", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Debug", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Delimiter", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Keyword", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Macro", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Operator", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("PreProc", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Statement", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("Repeat", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
 
-call Highlight("diffChange", s:white, s:purple_slate, s:none)
-call Highlight("diffText", s:white, s:bright_blue, s:bold)
-call Highlight("diffDelete", s:dark_red, s:blood_red, s:none)
-call Highlight("diffAdd", s:none, s:dark_green, s:none)
-call Highlight("diffAdded", s:light_green, s:none, s:none)
-call Highlight("diffRemoved", s:magenta, s:none, s:none)
-call Highlight("diffFile", s:white, s:none, s:bold)
-call Highlight("diffLine", s:purple, s:none, s:bold)
-call Highlight("diffIndexLine", s:purple, s:none, s:bold)
-call Highlight("diffSubname", s:yellow, s:none, s:none)
-call Highlight("gitcommitHeader", s:light_blue, s:none, s:none)
-call Highlight("gitcommitSelectedFile", s:orange, s:none, s:none)
-call Highlight("gitcommitSummary", s:white, s:none, s:none)
-call Highlight("gitcommitOverflow", s:magenta, s:none, s:none)
+call Highlight("diffChange", { 'fg': s:white, 'bg': s:purple_slate, 'style': s:none })
+call Highlight("diffText", { 'fg': s:white, 'bg': s:bright_blue, 'style': s:bold })
+call Highlight("diffDelete", { 'fg': s:dark_red, 'bg': s:blood_red, 'style': s:none })
+call Highlight("diffAdd", { 'fg': s:none, 'bg': s:dark_green, 'style': s:none })
+call Highlight("diffAdded", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("diffRemoved", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("diffFile", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
+call Highlight("diffLine", { 'fg': s:purple, 'bg': s:none, 'style': s:bold })
+call Highlight("diffIndexLine", { 'fg': s:purple, 'bg': s:none, 'style': s:bold })
+call Highlight("diffSubname", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
+call Highlight("gitcommitHeader", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("gitcommitSelectedFile", { 'fg': s:orange, 'bg': s:none, 'style': s:none })
+call Highlight("gitcommitSummary", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("gitcommitOverflow", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
 
-call Highlight("SpecialKey", s:dark_grey, s:none, s:none)
-call Highlight("IncSearch", s:bright_yellow, s:black, s:bold_underline)
-call Highlight("Search", s:black, s:bright_yellow, s:bold)
+call Highlight("SpecialKey", { 'fg': s:dark_grey, 'bg': s:none, 'style': s:none })
+call Highlight("IncSearch", { 'fg': s:bright_yellow, 'bg': s:black, 'style': s:bold_underline })
+call Highlight("Search", { 'fg': s:black, 'bg': s:bright_yellow, 'style': s:bold })
 
-call Highlight("Identifier", s:light_blue, s:none, s:none)
-call Highlight("Question", s:light_blue, s:none, s:none)
-call Highlight("StorageClass", s:light_blue, s:none, s:italic)
-call Highlight("Structure", s:light_blue, s:none, s:none)
-call Highlight("Typedef", s:light_blue, s:none, s:none)
+call Highlight("Identifier", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("Question", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("StorageClass", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("Structure", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("Typedef", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
 
-call Highlight("Function", s:light_green, s:none, s:none)
+call Highlight("Function", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
 
-call Highlight("PreCondit", s:purple, s:none, s:none)
-call Highlight("Constant", s:purple, s:none, s:none)
-call Highlight("Directory", s:purple, s:none, s:none)
-call Highlight("Tag", s:purple, s:none, s:none)
-call Highlight("Boolean", s:purple, s:none, s:none)
-call Highlight("Character", s:purple, s:none, s:none)
-call Highlight("Float", s:purple, s:none, s:none)
-call Highlight("Number", s:purple, s:none, s:none)
-call Highlight("jsFutureKeys", s:purple, s:none, s:none)
+call Highlight("PreCondit", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("Constant", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("Directory", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("Tag", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("Boolean", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("Character", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("Float", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("Number", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("jsFutureKeys", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
 
-call Highlight("Folded", s:grey, s:none, s:none)
-call Highlight("FoldColumn", s:light_grey, s:none, s:none)
-call Highlight("Comment", s:grey, s:none, s:italic)
+call Highlight("Folded", { 'fg': s:grey, 'bg': s:none, 'style': s:none })
+call Highlight("FoldColumn", { 'fg': s:light_grey, 'bg': s:none, 'style': s:none })
+call Highlight("Comment", { 'fg': s:grey, 'bg': s:none, 'style': s:italic })
 
-call Highlight("Label", s:yellow, s:none, s:none)
-call Highlight("String", s:yellow, s:none, s:none)
+call Highlight("Label", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
+call Highlight("String", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
 
-call Highlight("Todo", s:yellow, s:dark_grey, s:bold)
-call Highlight("Underlined", s:none, s:none, s:underline)
+call Highlight("Todo", { 'fg': s:yellow, 'bg': s:dark_grey, 'style': s:bold })
+call Highlight("Underlined", { 'fg': s:none, 'bg': s:none, 'style': s:underline })
 
-call Highlight("Pmenu", s:light_blue, s:darker_grey, s:none)
-call Highlight("PmenuSel", s:yellow, s:dark_grey, s:none)
-call Highlight("PmenuSbar", s:none, s:grey, s:none)
-call Highlight("PmenuThumb", s:dark_grey, s:white, s:none)
+call Highlight("Pmenu", { 'fg': s:light_blue, 'bg': s:darker_grey, 'style': s:none })
+call Highlight("PmenuSel", { 'fg': s:yellow, 'bg': s:dark_grey, 'style': s:none })
+call Highlight("PmenuSbar", { 'fg': s:none, 'bg': s:grey, 'style': s:none })
+call Highlight("PmenuThumb", { 'fg': s:dark_grey, 'bg': s:white, 'style': s:none })
 
-call Highlight("MoreMsg", s:light_green, s:none, s:none)
-
-" Javascript syntax overwrites from vim-javascript plugin
-syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsTemplateString,jsDecorator,jsAsyncKeyword extend fold
+call Highlight("MoreMsg", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
 
 " Javascript colour highlighting rules
-call Highlight("Noise", s:magenta, s:none, s:none)
-call Highlight("jsParensIfElse", s:white, s:none, s:none)
-call Highlight("jsParensRepeat", s:white, s:none, s:none)
-call Highlight("jsParensSwitch", s:white, s:none, s:none)
-call Highlight("jsParensCatch", s:white, s:none, s:none)
+call Highlight("Noise", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("jsParensIfElse", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsParensRepeat", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsParensSwitch", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsParensCatch", { 'fg': s:white, 'bg': s:none, 'style': s:none })
 
-call Highlight("jsArrowFunction", s:light_blue, s:none, s:none)
-call Highlight("jsArrowFuncArgs", s:orange, s:none, s:italic)
+call Highlight("jsArrowFunction", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("jsArrowFuncArgs", { 'fg': s:orange, 'bg': s:none, 'style': s:italic })
 
-call Highlight("jsBrackets", s:white, s:none, s:none)
-call Highlight("jsBraces", s:white, s:none, s:none)
-call Highlight("jsFuncBraces", s:white, s:none, s:none)
-call Highlight("jsClassBraces", s:white, s:none, s:none)
-call Highlight("jsIfElseBraces", s:white, s:none, s:none)
+call Highlight("jsBrackets", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsFuncBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsClassBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsIfElseBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
 
-call Highlight("jsTryCatchBraces", s:white, s:none, s:none)
-call Highlight("jsModuleBraces", s:white, s:none, s:none)
-call Highlight("jsObjectBraces", s:white, s:none, s:none)
-call Highlight("jsFinallyBraces", s:white, s:none, s:none)
-call Highlight("jsRepeatBraces", s:white, s:none, s:none)
-call Highlight("jsSwitchBraces", s:white, s:none, s:none)
-call Highlight("jsTemplateBraces", s:purple, s:none, s:none)
+call Highlight("jsTryCatchBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsModuleBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsObjectBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsFinallyBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsRepeatBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsSwitchBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsTemplateBraces", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
 
-call Highlight("jsDestructuringBraces", s:white, s:none, s:none)
-call Highlight("jsFuncName", s:light_green, s:none, s:none)
-call Highlight("jsFuncCall", s:light_blue, s:none, s:none)
-call Highlight("jsClassFuncName", s:light_green, s:none, s:none)
-call Highlight("jsArguments", s:orange, s:none, s:italic)
-call Highlight("jsFuncArgs", s:orange, s:none, s:italic)
-call Highlight("jsClassKeyword", s:light_blue, s:none, s:italic)
+call Highlight("jsDestructuringBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsFuncName", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("jsFuncCall", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("jsClassFuncName", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("jsArguments", { 'fg': s:orange, 'bg': s:none, 'style': s:italic })
+call Highlight("jsFuncArgs", { 'fg': s:orange, 'bg': s:none, 'style': s:italic })
+call Highlight("jsClassKeyword", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
 
-call Highlight("jsThis", s:orange, s:none, s:italic)
-call Highlight("jsUndefined", s:purple, s:none, s:none)
-call Highlight("jsNull", s:purple, s:none, s:none)
-call Highlight("jsParens", s:white, s:none, s:none)
-call Highlight("jsFuncParens", s:white, s:none, s:none)
-call Highlight("jsGlobalObjects", s:light_blue, s:none, s:none)
-call Highlight("jsFunction", s:light_blue, s:none, s:italic)
-call Highlight("jsClassMethodType", s:light_blue, s:none, s:italic)
-call Highlight("jsObjectKey", s:white, s:none, s:none)
-call Highlight("jsBlockLabel", s:white, s:none, s:none)
-call Highlight("jsObjectColon", s:magenta, s:none, s:none)
-call Highlight("jsObjectSeparator", s:purple, s:none, s:none)
-call Highlight("jsNoise", s:white, s:none, s:none)
-call Highlight("jsGlobalNodeObjects", s:magenta, s:none, s:none)
+call Highlight("jsThis", { 'fg': s:orange, 'bg': s:none, 'style': s:italic })
+call Highlight("jsUndefined", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("jsNull", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("jsParens", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsFuncParens", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsGlobalObjects", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("jsFunction", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("jsClassMethodType", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("jsObjectKey", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsBlockLabel", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsObjectColon", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("jsObjectSeparator", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("jsNoise", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("jsGlobalNodeObjects", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
 
-call Highlight("EcmaScriptTemplateStrings", s:yellow, s:none, s:italic)
+call Highlight("EcmaScriptTemplateStrings", { 'fg': s:yellow, 'bg': s:none, 'style': s:italic })
 
 hi def link jsComment              Comment
 hi def link jsEnvComment           Comment
@@ -346,203 +347,203 @@ hi def link jsHtmlElemFuncs        PreProc
 hi def link jsCssStyles            Label
 
 " HTML
-call Highlight("htmlTag", s:white, s:none, s:none)
-call Highlight("htmlTagN", s:magenta, s:none, s:none)
-call Highlight("htmlEndTag", s:white, s:none, s:none)
-call Highlight("htmlArg", s:light_green, s:none, s:none)
+call Highlight("htmlTag", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("htmlTagN", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("htmlEndTag", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("htmlArg", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
 
 " JSX highlighting
-call Highlight("jsxTagName", s:purple, s:none, s:none)
-call Highlight("jsxComponentName", s:light_blue, s:none, s:none)
-call Highlight("jsxEqual", s:magenta, s:none, s:none)
-call Highlight("jsxPunct", s:grey, s:none, s:none)
-call Highlight("jsxCloseString", s:grey, s:none, s:none)
-call Highlight("jsxAttrib", s:white, s:none, s:italic)
+call Highlight("jsxTagName", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("jsxComponentName", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("jsxEqual", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("jsxPunct", { 'fg': s:grey, 'bg': s:none, 'style': s:none })
+call Highlight("jsxCloseString", { 'fg': s:grey, 'bg': s:none, 'style': s:none })
+call Highlight("jsxAttrib", { 'fg': s:white, 'bg': s:none, 'style': s:italic })
 
 " Typescript
 " 'HerringtonDarkholme/yats.vim'
-call Highlight("typescriptCastKeyword", s:magenta, s:none, s:none)
-call Highlight("typescriptImport", s:magenta, s:none, s:none)
-call Highlight("typescriptExport", s:magenta, s:none, s:none)
-call Highlight("typescriptCall", s:white, s:none, s:italic)
-call Highlight("typescriptArrowFuncArg", s:orange, s:none, s:italic)
-call Highlight("typescriptAliasDeclaration", s:light_green, s:none, s:none)
-call Highlight("typescriptAliasKeyword", s:light_blue, s:none, s:italic)
-call Highlight("typescriptInterfaceKeyword", s:light_blue, s:none, s:italic)
-call Highlight("typescriptTypeReference", s:light_green, s:none, s:none)
-call Highlight("typescriptPredefinedType", s:light_blue, s:none, s:italic)
-call Highlight("typescriptMember", s:white, s:none, s:italic)
-call Highlight("typescriptObjectColon", s:magenta, s:none, s:none)
-call Highlight("typescriptTypeAnnotation", s:magenta, s:none, s:none)
-call Highlight("typescriptTernaryOp", s:magenta, s:none, s:none)
-call Highlight("typescriptDestructureVariable", s:white, s:none, s:none)
-call Highlight("typescriptObjectLabel", s:white, s:none, s:none)
-call Highlight("typescriptTypeBrackets", s:light_blue, s:none, s:none)
-call Highlight("typescriptVariable", s:light_blue, s:none, s:italic)
-call Highlight("typescriptArrowFunc", s:light_blue, s:none, s:none)
-call Highlight("typescriptFuncType", s:orange, s:none, s:italic)
-call Highlight("typescriptMemberOptionality", s:magenta, s:none, s:none)
-call Highlight("typescriptFuncTypeArrow", s:light_blue, s:none, s:none)
-call Highlight("typescriptMathStaticMethod", s:light_blue, s:none, s:none)
-call Highlight("typescriptJSONStaticMethod", s:light_blue, s:none, s:none)
-call Highlight("typescriptDOMStorageMethod", s:light_blue, s:none, s:none)
-call Highlight("typescriptDateMethod", s:light_blue, s:none, s:none)
-call Highlight("typescriptRegExpMethod", s:light_blue, s:none, s:none)
-call Highlight("typescriptArrayMethod", s:light_blue, s:none, s:none)
-call Highlight("typescriptHeadersMethod", s:light_blue, s:none, s:none)
-call Highlight("typescriptHeadersMethod", s:light_blue, s:none, s:none)
-call Highlight("typescriptURLUtilsProp", s:light_blue, s:none, s:none)
-call Highlight("typescriptBOMHistoryProp", s:light_blue, s:none, s:none)
-call Highlight("typescriptOperator", s:magenta, s:none, s:none)
-call Highlight("typescriptGlobalMathDot", s:magenta, s:none, s:none)
-call Highlight("typescriptDotNotation", s:magenta, s:none, s:none)
-call Highlight("typescriptGlobalJSONDot", s:magenta, s:none, s:none)
-call Highlight("typescriptBinaryOp", s:magenta, s:none, s:none)
-call Highlight("typescriptUnaryOp", s:magenta, s:none, s:none)
-call Highlight("typescriptAssign", s:magenta, s:none, s:none)
-call Highlight("typescriptOptionalMark", s:purple, s:none, s:italic)
-call Highlight("typescriptTemplateSB", s:purple, s:none, s:none)
-call Highlight("typescriptTestGlobal", s:light_blue, s:none, s:none)
-call Highlight("typescriptPaymentShippingOptionProp", s:none, s:none, s:none)
+call Highlight("typescriptCastKeyword", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptImport", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptExport", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptCall", { 'fg': s:white, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptArrowFuncArg", { 'fg': s:orange, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptAliasDeclaration", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptAliasKeyword", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptInterfaceKeyword", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptTypeReference", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptPredefinedType", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptMember", { 'fg': s:white, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptObjectColon", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTypeAnnotation", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTernaryOp", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptDestructureVariable", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptObjectLabel", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTypeBrackets", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptVariable", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptArrowFunc", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptFuncType", { 'fg': s:orange, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptMemberOptionality", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptFuncTypeArrow", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptMathStaticMethod", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptJSONStaticMethod", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptDOMStorageMethod", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptDateMethod", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptRegExpMethod", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptArrayMethod", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptHeadersMethod", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptHeadersMethod", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptURLUtilsProp", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptBOMHistoryProp", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptOperator", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptGlobalMathDot", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptDotNotation", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptGlobalJSONDot", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptBinaryOp", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptUnaryOp", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptAssign", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptOptionalMark", { 'fg': s:purple, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptTemplateSB", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTestGlobal", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptPaymentShippingOptionProp", { 'fg': s:none, 'bg': s:none, 'style': s:none })
 " 'leafgarland/typescript-vim'
-call Highlight("typescriptNull", s:purple, s:none, s:none)
-call Highlight("typescriptType", s:light_blue, s:none, s:italic)
-call Highlight("typescriptEndColons", s:white, s:none, s:none)
-call Highlight("typescriptLabel", s:magenta, s:none, s:none)
-call Highlight("typescriptLogicSymbols", s:magenta, s:none, s:none)
-call Highlight("typescriptParens", s:white, s:none, s:none)
-call Highlight("typescriptBraces", s:white, s:none, s:none)
-call Highlight("typescriptDotNotation", s:magenta, s:none, s:none)
-call Highlight("typescriptInterpolationDelimiter", s:purple, s:none, s:none)
-call Highlight("typescriptExceptions", s:magenta, s:none, s:bold)
-call Highlight("typescriptFuncKeyword", s:light_blue, s:none, s:italic)
+call Highlight("typescriptNull", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptType", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptEndColons", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptLabel", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptLogicSymbols", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptParens", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptDotNotation", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptInterpolationDelimiter", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptExceptions", { 'fg': s:magenta, 'bg': s:none, 'style': s:bold })
+call Highlight("typescriptFuncKeyword", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
 
 " New typescript definition names
-call Highlight("typescriptGlobalNodeObjects", s:magenta, s:none, s:none)
-call Highlight("typescriptGlobalObjects", s:light_blue, s:none, s:none)
-call Highlight("typescriptArrowFunction", s:light_blue, s:none, s:none)
-call Highlight("typescriptFuncCall", s:light_blue, s:none, s:none)
+call Highlight("typescriptGlobalNodeObjects", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptGlobalObjects", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptArrowFunction", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptFuncCall", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
 
 " TypeScript Treesitter
-call Highlight("typescriptTSBoolean", s:orange, s:none, s:none)
-call Highlight("typescriptTSVariable", s:white, s:none, s:none)
-call Highlight("typescriptTSConstructor", s:white, s:none, s:none)
-call Highlight("typescriptTSPunctDelimiter", s:white, s:none, s:none)
-call Highlight("typescriptTSPunctBracket", s:white, s:none, s:none)
-call Highlight("typescriptTSConstant", s:white, s:none, s:none)
-call Highlight("typescriptTSTypeBuiltin", s:light_blue, s:none, s:italic)
-call Highlight("typescriptTSType", s:light_green, s:none, s:none)
-call Highlight("typescriptTSKeyword", s:light_blue, s:none, s:italic)
-call Highlight("typescriptTSProperty", s:white, s:none, s:none)
-call Highlight("typescriptTSParameter", s:orange, s:none, s:italic)
+call Highlight("typescriptTSBoolean", { 'fg': s:orange, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTSVariable", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTSConstructor", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTSPunctDelimiter", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTSPunctBracket", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTSConstant", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTSTypeBuiltin", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptTSType", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTSKeyword", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("typescriptTSProperty", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("typescriptTSParameter", { 'fg': s:orange, 'bg': s:none, 'style': s:italic })
 
 
 
 " GraphQL
-call Highlight("graphqlStructure", s:magenta, s:none, s:none)
-call Highlight("graphqlBraces", s:white, s:none, s:none)
-call Highlight("graphqlConstant", s:white, s:none, s:none)
-call Highlight("graphqlType", s:purple, s:none, s:none)
+call Highlight("graphqlStructure", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("graphqlBraces", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("graphqlConstant", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("graphqlType", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
 
 " vim
-call Highlight("vimParenSep", s:white, s:none, s:bold)
-call Highlight("vimOperParen", s:light_blue, s:none, s:italic)
-call Highlight("vimUserFunc", s:purple, s:none, s:none)
-call Highlight("vimFunction", s:orange, s:none, s:none)
+call Highlight("vimParenSep", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
+call Highlight("vimOperParen", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("vimUserFunc", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("vimFunction", { 'fg': s:orange, 'bg': s:none, 'style': s:none })
 
 " XML highlighting.
 hi def link xmlTodo   Todo
-call Highlight("xmlTag", s:light_blue, s:none, s:none)
-call Highlight("xmlTagName", s:light_blue, s:none, s:none)
-call Highlight("xmlEndTag", s:light_blue, s:none, s:none)
-call Highlight("xmlEqual", s:magenta, s:none, s:none)
+call Highlight("xmlTag", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("xmlTagName", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("xmlEndTag", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("xmlEqual", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
 
 " JSON highlighting
-call Highlight("jsonKeyword", s:light_blue, s:none, s:none)
-call Highlight("jsonString", s:yellow, s:none, s:none)
+call Highlight("jsonKeyword", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("jsonString", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
 
 " Clojure highlighting
-call Highlight("clojureParen", s:white, s:none, s:none)
-call Highlight("clojureDefine", s:light_blue, s:none, s:italic)
-call Highlight("clojureMacro", s:light_blue, s:none, s:none)
+call Highlight("clojureParen", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("clojureDefine", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
+call Highlight("clojureMacro", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
 
 " R language
-call Highlight("rFunction", s:light_blue, s:none, s:none)
+call Highlight("rFunction", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
 
 " C/C++
-call Highlight("cType", s:light_blue, s:none, s:italic)
+call Highlight("cType", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
 
 " NERDTree highlighting
-call Highlight("NERDTreeClosable", s:yellow, s:none, s:none)
-call Highlight("NERDTreeOpenable", s:yellow, s:none, s:none)
-call Highlight("NERDTreeDirSlash", s:light_blue, s:none, s:none)
-call Highlight("NERDTreeFile", s:none, s:none, s:none)
+call Highlight("NERDTreeClosable", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
+call Highlight("NERDTreeOpenable", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
+call Highlight("NERDTreeDirSlash", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("NERDTreeFile", { 'fg': s:none, 'bg': s:none, 'style': s:none })
 
 " Ruby
-call Highlight("rubyStringDelimiter", s:yellow, s:none, s:none)
+call Highlight("rubyStringDelimiter", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
 
 " Calendar
-call Highlight("CalNavi", s:light_blue, s:none, s:bold_underline)
-call Highlight("CalToday", s:magenta, s:none, s:bold)
-call Highlight("CalSaturday", s:purple, s:none, s:none)
-call Highlight("CalSunday", s:purple, s:none, s:none)
-call Highlight("CalHeader", s:light_green, s:none, s:none)
-call Highlight("CalRuler", s:grey, s:darker_grey, s:bold)
+call Highlight("CalNavi", { 'fg': s:light_blue, 'bg': s:none, 'style': s:bold_underline })
+call Highlight("CalToday", { 'fg': s:magenta, 'bg': s:none, 'style': s:bold })
+call Highlight("CalSaturday", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("CalSunday", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("CalHeader", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("CalRuler", { 'fg': s:grey, 'bg': s:darker_grey, 'style': s:bold })
 
 " Markdown https://github.com/tpope/vim-markdown/
-call Highlight("markdownCode", s:light_grey, s:none, s:bold)
-call Highlight("markdownCodeDelimiter", s:yellow, s:none, s:none)
+call Highlight("markdownCode", { 'fg': s:light_grey, 'bg': s:none, 'style': s:bold })
+call Highlight("markdownCodeDelimiter", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
 
 " Markdown https://github.com/plasticboy/vim-markdown
-call Highlight("mkdHeading", s:magenta, s:none, s:none)
-call Highlight("mkdURL", s:purple, s:none, s:none)
-call Highlight("mkdCode", s:orange, s:none, s:none)
-call Highlight("mkdCodeStart", s:light_green, s:none, s:none)
-call Highlight("mkdCodeEnd", s:light_green, s:none, s:none)
-call Highlight("mkdDelimiter", s:light_blue, s:none, s:none)
+call Highlight("mkdHeading", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("mkdURL", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("mkdCode", { 'fg': s:orange, 'bg': s:none, 'style': s:none })
+call Highlight("mkdCodeStart", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("mkdCodeEnd", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("mkdDelimiter", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
 
 " Vimwiki
-call Highlight("VimwikiDelText", s:grey, s:none, s:none)
-call Highlight("VimwikiHeaderChar", s:magenta, s:none, s:bold)
-call Highlight("VimwikiHeader1", s:white, s:none, s:bold)
-call Highlight("VimwikiHeader2", s:white, s:none, s:bold)
-call Highlight("VimwikiHeader3", s:white, s:none, s:bold)
-call Highlight("VimwikiHeader4", s:white, s:none, s:bold)
-call Highlight("VimwikiHeader5", s:white, s:none, s:bold)
-call Highlight("VimwikiHeader6", s:white, s:none, s:bold)
-call Highlight("VimwikiPre", s:light_green, s:none, s:bold)
-call Highlight("VimwikiCode", s:purple, s:none, s:none)
-call Highlight("VimwikiCodeChar", s:purple, s:none, s:none)
-call Highlight("VimwikiBoldChar", s:none, s:none, s:none)
-call Highlight("VimwikiItalicChar", s:none, s:none, s:none)
+call Highlight("VimwikiDelText", { 'fg': s:grey, 'bg': s:none, 'style': s:none })
+call Highlight("VimwikiHeaderChar", { 'fg': s:magenta, 'bg': s:none, 'style': s:bold })
+call Highlight("VimwikiHeader1", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
+call Highlight("VimwikiHeader2", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
+call Highlight("VimwikiHeader3", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
+call Highlight("VimwikiHeader4", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
+call Highlight("VimwikiHeader5", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
+call Highlight("VimwikiHeader6", { 'fg': s:white, 'bg': s:none, 'style': s:bold })
+call Highlight("VimwikiPre", { 'fg': s:light_green, 'bg': s:none, 'style': s:bold })
+call Highlight("VimwikiCode", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("VimwikiCodeChar", { 'fg': s:purple, 'bg': s:none, 'style': s:none })
+call Highlight("VimwikiBoldChar", { 'fg': s:none, 'bg': s:none, 'style': s:none })
+call Highlight("VimwikiItalicChar", { 'fg': s:none, 'bg': s:none, 'style': s:none })
 
 " GitGutter
-call Highlight("GitGutterAdd", s:light_green, s:none, s:none)
-call Highlight("GitGutterChange", s:light_blue, s:none, s:none)
-call Highlight("GitGutterDelete", s:magenta, s:none, s:none)
-call Highlight("GitGutterChangeDelete", s:orange, s:none, s:none)
+call Highlight("GitGutterAdd", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("GitGutterChange", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("GitGutterDelete", { 'fg': s:magenta, 'bg': s:none, 'style': s:none })
+call Highlight("GitGutterChangeDelete", { 'fg': s:orange, 'bg': s:none, 'style': s:none })
 
 " Python
-call Highlight("pythonBuiltin", s:light_blue, s:none, s:none)
-call Highlight("pythonBuiltinFunc", s:light_blue, s:none, s:none)
-call Highlight("pythonFunction", s:light_green, s:none, s:none)
-call Highlight("pythonClass", s:light_green, s:none, s:none)
-call Highlight("pythonFunctionCall", s:light_blue, s:none, s:none)
-call Highlight("pythonClassVar", s:orange, s:none, s:italic)
-call Highlight("pythonExClass", s:light_blue, s:none, s:italic)
+call Highlight("pythonBuiltin", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("pythonBuiltinFunc", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("pythonFunction", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("pythonClass", { 'fg': s:light_green, 'bg': s:none, 'style': s:none })
+call Highlight("pythonFunctionCall", { 'fg': s:light_blue, 'bg': s:none, 'style': s:none })
+call Highlight("pythonClassVar", { 'fg': s:orange, 'bg': s:none, 'style': s:italic })
+call Highlight("pythonExClass", { 'fg': s:light_blue, 'bg': s:none, 'style': s:italic })
 hi link pythonTripleQuotes Comment
 hi link pythonDoctest Comment
 hi link pythonDoctest2 Comment
 
 " Nvim LSP
-call Highlight("LspDiagnosticsDefaultError", { "cterm": 197, "gui": "#fd2c40" }, s:none, s:none)
-call Highlight("LspDiagnosticsDefaultWarning", s:yellow, s:none, s:none)
-call Highlight("LspDiagnosticsDefaultInformation", s:white, s:none, s:none)
-call Highlight("LspDiagnosticsDefaultHint", s:light_grey, s:none, s:none)
-call Highlight("LspDiagnosticsUnderlineError", s:none, s:none, s:underline)
-call Highlight("LspDiagnosticsUnderlineWarning", s:none, s:none, s:underline)
-call Highlight("LspDiagnosticsUnderlineInformation", s:none, s:none, s:underline)
-call Highlight("LspDiagnosticsUnderlineHint", s:none, s:none, s:underline)
+call Highlight("LspDiagnosticsDefaultError", { 'fg': { "cterm": 197, "gui": "#fd2c40" }})
+call Highlight("LspDiagnosticsDefaultWarning", { 'fg': s:yellow, 'bg': s:none, 'style': s:none })
+call Highlight("LspDiagnosticsDefaultInformation", { 'fg': s:white, 'bg': s:none, 'style': s:none })
+call Highlight("LspDiagnosticsDefaultHint", { 'fg': s:light_grey, 'bg': s:none, 'style': s:none })
+call Highlight("LspDiagnosticsUnderlineError", { 'fg': s:none, 'bg': s:none, 'style': s:underline })
+call Highlight("LspDiagnosticsUnderlineWarning", { 'fg': s:none, 'bg': s:none, 'style': s:underline })
+call Highlight("LspDiagnosticsUnderlineInformation", { 'fg': s:none, 'bg': s:none, 'style': s:underline })
+call Highlight("LspDiagnosticsUnderlineHint", { 'fg': s:none, 'bg': s:none, 'style': s:underline })
 
 " Must be at the end, because of ctermbg=234 bug.
 " https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ