diff --git a/colors/nord.vim b/colors/nord.vim
index 23f9586..e5fab31 100755
--- a/colors/nord.vim
+++ b/colors/nord.vim
@@ -98,25 +98,25 @@ endif
 let g:nord_cursor_line_number_background = get(g:, "nord_cursor_line_number_background", 0)
 let g:nord_uniform_diff_background = get(g:, "nord_uniform_diff_background", 0)
 
-function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+function! s:hi(group, guifg="", guibg="", ctermfg="", ctermbg="", attr="", guisp="")
   let cmd = ""
   if a:guifg != ""
-    let cmd = cmd . " guifg=" . a:guifg
+    let cmd .= " guifg=" . a:guifg
   endif
   if a:guibg != ""
-    let cmd = cmd . " guibg=" . a:guibg
+    let cmd .= " guibg=" . a:guibg
   endif
   if a:ctermfg != ""
-    let cmd = cmd . " ctermfg=" . a:ctermfg
+    let cmd .= " ctermfg=" . a:ctermfg
   endif
   if a:ctermbg != ""
-    let cmd = cmd . " ctermbg=" . a:ctermbg
+    let cmd .= " ctermbg=" . a:ctermbg
   endif
   if a:attr != ""
-    let cmd = cmd . " gui=" . a:attr . " cterm=" . substitute(a:attr, "undercurl", s:underline, "")
+    let cmd .= " gui=" . a:attr . " cterm=" . substitute(a:attr, "undercurl", s:underline, "")
   endif
   if a:guisp != ""
-    let cmd = cmd . " guisp=" . a:guisp
+    let cmd .= " guisp=" . a:guisp
   endif
   if cmd != ""
     exec "hi " . a:group . cmd
@@ -127,31 +127,31 @@ endfunction
 "+ UI Components +
 "+---------------+
 "+--- Attributes ---+
-call s:hi("Bold", "", "", "", "", s:bold, "")
-call s:hi("Italic", "", "", "", "", s:italic, "")
-call s:hi("Underline", "", "", "", "", s:underline, "")
+call s:hi("Bold", "", "", "", "", s:bold)
+call s:hi("Italic", "", "", "", "", s:italic)
+call s:hi("Underline", "", "", "", "", s:underline)
 
 "+--- Editor ---+
-call s:hi("ColorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "")
-call s:hi("Cursor", s:nord0_gui, s:nord4_gui, "", "NONE", "", "")
-call s:hi("CursorLine", "", s:nord1_gui, "NONE", s:nord1_term, "NONE", "")
-call s:hi("Error", s:nord4_gui, s:nord11_gui, "", s:nord11_term, "", "")
-call s:hi("iCursor", s:nord0_gui, s:nord4_gui, "", "NONE", "", "")
-call s:hi("LineNr", s:nord3_gui, "NONE", s:nord3_term, "NONE", "", "")
-call s:hi("MatchParen", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "", "")
-call s:hi("NonText", s:nord2_gui, "", s:nord3_term, "", "", "")
-call s:hi("Normal", s:nord4_gui, s:nord0_gui, "NONE", "NONE", "", "")
-call s:hi("Pmenu", s:nord4_gui, s:nord2_gui, "NONE", s:nord1_term, "NONE", "")
-call s:hi("PmenuSbar", s:nord4_gui, s:nord2_gui, "NONE", s:nord1_term, "", "")
-call s:hi("PmenuSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "", "")
-call s:hi("PmenuThumb", s:nord8_gui, s:nord3_gui, "NONE", s:nord3_term, "", "")
-call s:hi("SpecialKey", s:nord3_gui, "", s:nord3_term, "", "", "")
+call s:hi("ColorColumn", "", s:nord1_gui, "NONE", s:nord1_term)
+call s:hi("Cursor", s:nord0_gui, s:nord4_gui, "", "NONE")
+call s:hi("CursorLine", "", s:nord1_gui, "NONE", s:nord1_term, "NONE")
+call s:hi("Error", s:nord4_gui, s:nord11_gui, "", s:nord11_term)
+call s:hi("iCursor", s:nord0_gui, s:nord4_gui, "", "NONE")
+call s:hi("LineNr", s:nord3_gui, "NONE", s:nord3_term, "NONE")
+call s:hi("MatchParen", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term)
+call s:hi("NonText", s:nord2_gui, "", s:nord3_term)
+call s:hi("Normal", s:nord4_gui, s:nord0_gui, "NONE", "NONE")
+call s:hi("Pmenu", s:nord4_gui, s:nord2_gui, "NONE", s:nord1_term, "NONE")
+call s:hi("PmenuSbar", s:nord4_gui, s:nord2_gui, "NONE", s:nord1_term)
+call s:hi("PmenuSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term)
+call s:hi("PmenuThumb", s:nord8_gui, s:nord3_gui, "NONE", s:nord3_term)
+call s:hi("SpecialKey", s:nord3_gui, "", s:nord3_term)
 call s:hi("SpellBad", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "undercurl", s:nord11_gui)
 call s:hi("SpellCap", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "undercurl", s:nord13_gui)
 call s:hi("SpellLocal", s:nord5_gui, s:nord0_gui, s:nord5_term, "NONE", "undercurl", s:nord5_gui)
 call s:hi("SpellRare", s:nord6_gui, s:nord0_gui, s:nord6_term, "NONE", "undercurl", s:nord6_gui)
-call s:hi("Visual", "", s:nord2_gui, "", s:nord1_term, "", "")
-call s:hi("VisualNOS", "", s:nord2_gui, "", s:nord1_term, "", "")
+call s:hi("Visual", "", s:nord2_gui, "", s:nord1_term)
+call s:hi("VisualNOS", "", s:nord2_gui, "", s:nord1_term)
 
 "+- Vim 8 Terminal Colors -+
 if has('terminal')
@@ -178,116 +178,116 @@ if has('nvim')
   let g:terminal_color_15 = s:nord6_gui
 
   "+- Neovim Support -+
-  call s:hi("healthError", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term, "", "")
-  call s:hi("healthSuccess", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "")
-  call s:hi("healthWarning", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "")
-  call s:hi("TermCursorNC", "", s:nord1_gui, "", s:nord1_term, "", "")
+  call s:hi("healthError", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term)
+  call s:hi("healthSuccess", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term)
+  call s:hi("healthWarning", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term)
+  call s:hi("TermCursorNC", "", s:nord1_gui, "", s:nord1_term)
 
   "+- Neovim Diagnostics API -+
-  call s:hi("DiagnosticWarn", s:nord13_gui, "", s:nord13_term, "", "", "")
-  call s:hi("DiagnosticError" , s:nord11_gui, "", s:nord11_term, "", "", "")
-  call s:hi("DiagnosticInfo" , s:nord8_gui, "", s:nord8_term, "", "", "")
-  call s:hi("DiagnosticHint" , s:nord10_gui, "", s:nord10_term, "", "", "")
-  call s:hi("DiagnosticUnderlineWarn" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "")
-  call s:hi("DiagnosticUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "")
-  call s:hi("DiagnosticUnderlineInfo" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "")
-  call s:hi("DiagnosticUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "")
+  call s:hi("DiagnosticWarn", s:nord13_gui, "", s:nord13_term)
+  call s:hi("DiagnosticError" , s:nord11_gui, "", s:nord11_term)
+  call s:hi("DiagnosticInfo" , s:nord8_gui, "", s:nord8_term)
+  call s:hi("DiagnosticHint" , s:nord10_gui, "", s:nord10_term)
+  call s:hi("DiagnosticUnderlineWarn" , s:nord13_gui, "", s:nord13_term, "", "undercurl")
+  call s:hi("DiagnosticUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl")
+  call s:hi("DiagnosticUnderlineInfo" , s:nord8_gui, "", s:nord8_term, "", "undercurl")
+  call s:hi("DiagnosticUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl")
 
   "+- Neovim DocumentHighlight -+
-  call s:hi("LspReferenceText", "", s:nord3_gui, "", s:nord3_term, "", "")
-  call s:hi("LspReferenceRead", "", s:nord3_gui, "", s:nord3_term, "", "")
-  call s:hi("LspReferenceWrite", "", s:nord3_gui, "", s:nord3_term, "", "")
+  call s:hi("LspReferenceText", "", s:nord3_gui, "", s:nord3_term)
+  call s:hi("LspReferenceRead", "", s:nord3_gui, "", s:nord3_term)
+  call s:hi("LspReferenceWrite", "", s:nord3_gui, "", s:nord3_term)
 
   "+- Neovim LspSignatureHelp -+
-  call s:hi("LspSignatureActiveParameter", s:nord8_gui, "", s:nord8_term, "", s:underline, "")
+  call s:hi("LspSignatureActiveParameter", s:nord8_gui, "", s:nord8_term, "", s:underline)
 endif
 
 "+--- Gutter ---+
-call s:hi("CursorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "")
+call s:hi("CursorColumn", "", s:nord1_gui, "NONE", s:nord1_term)
 if g:nord_cursor_line_number_background == 0
-  call s:hi("CursorLineNr", s:nord4_gui, "", "NONE", "", "NONE", "")
+  call s:hi("CursorLineNr", s:nord4_gui, "", "NONE", "", "NONE")
 else
-  call s:hi("CursorLineNr", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "")
+  call s:hi("CursorLineNr", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE")
 endif
-call s:hi("Folded", s:nord3_gui, s:nord1_gui, s:nord3_term, s:nord1_term, s:bold, "")
-call s:hi("FoldColumn", s:nord3_gui, s:nord0_gui, s:nord3_term, "NONE", "", "")
-call s:hi("SignColumn", s:nord1_gui, s:nord0_gui, s:nord1_term, "NONE", "", "")
+call s:hi("Folded", s:nord3_gui, s:nord1_gui, s:nord3_term, s:nord1_term, s:bold)
+call s:hi("FoldColumn", s:nord3_gui, s:nord0_gui, s:nord3_term, "NONE")
+call s:hi("SignColumn", s:nord1_gui, s:nord0_gui, s:nord1_term, "NONE")
 
 "+--- Navigation ---+
-call s:hi("Directory", s:nord8_gui, "", s:nord8_term, "NONE", "", "")
+call s:hi("Directory", s:nord8_gui, "", s:nord8_term, "NONE")
 
 "+--- Prompt/Status ---+
-call s:hi("EndOfBuffer", s:nord1_gui, "", s:nord1_term, "NONE", "", "")
-call s:hi("ErrorMsg", s:nord4_gui, s:nord11_gui, "NONE", s:nord11_term, "", "")
-call s:hi("ModeMsg", s:nord4_gui, "", "", "", "", "")
-call s:hi("MoreMsg", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("Question", s:nord4_gui, "", "NONE", "", "", "")
+call s:hi("EndOfBuffer", s:nord1_gui, "", s:nord1_term, "NONE")
+call s:hi("ErrorMsg", s:nord4_gui, s:nord11_gui, "NONE", s:nord11_term)
+call s:hi("ModeMsg", s:nord4_gui)
+call s:hi("MoreMsg", s:nord8_gui, "", s:nord8_term)
+call s:hi("Question", s:nord4_gui, "", "NONE")
 if g:nord_uniform_status_lines == 0
-  call s:hi("StatusLine", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "")
-  call s:hi("StatusLineNC", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "")
-  call s:hi("StatusLineTerm", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "")
-  call s:hi("StatusLineTermNC", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "")
+  call s:hi("StatusLine", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE")
+  call s:hi("StatusLineNC", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE")
+  call s:hi("StatusLineTerm", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE")
+  call s:hi("StatusLineTermNC", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE")
 else
-  call s:hi("StatusLine", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "")
-  call s:hi("StatusLineNC", s:nord4_gui, s:nord3_gui, "NONE", s:nord3_term, "NONE", "")
-  call s:hi("StatusLineTerm", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "")
-  call s:hi("StatusLineTermNC", s:nord4_gui, s:nord3_gui, "NONE", s:nord3_term, "NONE", "")
+  call s:hi("StatusLine", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE")
+  call s:hi("StatusLineNC", s:nord4_gui, s:nord3_gui, "NONE", s:nord3_term, "NONE")
+  call s:hi("StatusLineTerm", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE")
+  call s:hi("StatusLineTermNC", s:nord4_gui, s:nord3_gui, "NONE", s:nord3_term, "NONE")
 endif
-call s:hi("WarningMsg", s:nord0_gui, s:nord13_gui, s:nord1_term, s:nord13_term, "", "")
-call s:hi("WildMenu", s:nord8_gui, s:nord1_gui, s:nord8_term, s:nord1_term, "", "")
+call s:hi("WarningMsg", s:nord0_gui, s:nord13_gui, s:nord1_term, s:nord13_term)
+call s:hi("WildMenu", s:nord8_gui, s:nord1_gui, s:nord8_term, s:nord1_term)
 
 "+--- Search ---+
-call s:hi("IncSearch", s:nord6_gui, s:nord10_gui, s:nord6_term, s:nord10_term, s:underline, "")
-call s:hi("Search", s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term, "NONE", "")
+call s:hi("IncSearch", s:nord6_gui, s:nord10_gui, s:nord6_term, s:nord10_term, s:underline)
+call s:hi("Search", s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term, "NONE")
 
 "+--- Tabs ---+
-call s:hi("TabLine", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "")
-call s:hi("TabLineFill", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE", "")
-call s:hi("TabLineSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE", "")
+call s:hi("TabLine", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE")
+call s:hi("TabLineFill", s:nord4_gui, s:nord1_gui, "NONE", s:nord1_term, "NONE")
+call s:hi("TabLineSel", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "NONE")
 
 "+--- Window ---+
-call s:hi("Title", s:nord4_gui, "", "NONE", "", "NONE", "")
+call s:hi("Title", s:nord4_gui, "", "NONE", "", "NONE")
 
 if g:nord_bold_vertical_split_line == 0
-  call s:hi("VertSplit", s:nord2_gui, s:nord0_gui, s:nord3_term, "NONE", "NONE", "")
+  call s:hi("VertSplit", s:nord2_gui, s:nord0_gui, s:nord3_term, "NONE", "NONE")
 else
-  call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NONE", "")
+  call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NONE")
 endif
 
 "+----------------------+
 "+ Language Base Groups +
 "+----------------------+
-call s:hi("Boolean", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Character", s:nord14_gui, "", s:nord14_term, "", "", "")
-call s:hi("Comment", s:nord3_gui_bright, "", s:nord3_term, "", s:italicize_comments, "")
-call s:hi("Conceal", "", "NONE", "", "NONE", "", "")
-call s:hi("Conditional", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Constant", s:nord4_gui, "", "NONE", "", "", "")
-call s:hi("Decorator", s:nord12_gui, "", s:nord12_term, "", "", "")
-call s:hi("Define", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Delimiter", s:nord6_gui, "", s:nord6_term, "", "", "")
-call s:hi("Exception", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Float", s:nord15_gui, "", s:nord15_term, "", "", "")
-call s:hi("Function", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("Identifier", s:nord4_gui, "", "NONE", "", "NONE", "")
-call s:hi("Include", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Keyword", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Label", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Number", s:nord15_gui, "", s:nord15_term, "", "", "")
-call s:hi("Operator", s:nord9_gui, "", s:nord9_term, "", "NONE", "")
-call s:hi("PreProc", s:nord9_gui, "", s:nord9_term, "", "NONE", "")
-call s:hi("Repeat", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Special", s:nord4_gui, "", "NONE", "", "", "")
-call s:hi("SpecialChar", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", s:italicize_comments, "")
-call s:hi("Statement", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("StorageClass", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("String", s:nord14_gui, "", s:nord14_term, "", "", "")
-call s:hi("Structure", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("Tag", s:nord4_gui, "", "", "", "", "")
-call s:hi("Todo", s:nord13_gui, "NONE", s:nord13_term, "NONE", "", "")
-call s:hi("Type", s:nord9_gui, "", s:nord9_term, "", "NONE", "")
-call s:hi("Typedef", s:nord9_gui, "", s:nord9_term, "", "", "")
+call s:hi("Boolean", s:nord9_gui, "", s:nord9_term)
+call s:hi("Character", s:nord14_gui, "", s:nord14_term)
+call s:hi("Comment", s:nord3_gui_bright, "", s:nord3_term, "", s:italicize_comments)
+call s:hi("Conceal", "", "NONE", "", "NONE")
+call s:hi("Conditional", s:nord9_gui, "", s:nord9_term)
+call s:hi("Constant", s:nord4_gui, "", "NONE")
+call s:hi("Decorator", s:nord12_gui, "", s:nord12_term)
+call s:hi("Define", s:nord9_gui, "", s:nord9_term)
+call s:hi("Delimiter", s:nord6_gui, "", s:nord6_term)
+call s:hi("Exception", s:nord9_gui, "", s:nord9_term)
+call s:hi("Float", s:nord15_gui, "", s:nord15_term)
+call s:hi("Function", s:nord8_gui, "", s:nord8_term)
+call s:hi("Identifier", s:nord4_gui, "", "NONE", "", "NONE")
+call s:hi("Include", s:nord9_gui, "", s:nord9_term)
+call s:hi("Keyword", s:nord9_gui, "", s:nord9_term)
+call s:hi("Label", s:nord9_gui, "", s:nord9_term)
+call s:hi("Number", s:nord15_gui, "", s:nord15_term)
+call s:hi("Operator", s:nord9_gui, "", s:nord9_term, "", "NONE")
+call s:hi("PreProc", s:nord9_gui, "", s:nord9_term, "", "NONE")
+call s:hi("Repeat", s:nord9_gui, "", s:nord9_term)
+call s:hi("Special", s:nord4_gui, "", "NONE")
+call s:hi("SpecialChar", s:nord13_gui, "", s:nord13_term)
+call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", s:italicize_comments)
+call s:hi("Statement", s:nord9_gui, "", s:nord9_term)
+call s:hi("StorageClass", s:nord9_gui, "", s:nord9_term)
+call s:hi("String", s:nord14_gui, "", s:nord14_term)
+call s:hi("Structure", s:nord9_gui, "", s:nord9_term)
+call s:hi("Tag", s:nord4_gui)
+call s:hi("Todo", s:nord13_gui, "NONE", s:nord13_term, "NONE")
+call s:hi("Type", s:nord9_gui, "", s:nord9_term, "", "NONE")
+call s:hi("Typedef", s:nord9_gui, "", s:nord9_term)
 hi! link Annotation Decorator
 hi! link Macro Define
 hi! link PreCondit PreProc
@@ -296,16 +296,16 @@ hi! link Variable Identifier
 "+-----------+
 "+ Languages +
 "+-----------+
-call s:hi("asciidocAttributeEntry", s:nord10_gui, "", s:nord10_term, "", "", "")
-call s:hi("asciidocAttributeList", s:nord10_gui, "", s:nord10_term, "", "", "")
-call s:hi("asciidocAttributeRef", s:nord10_gui, "", s:nord10_term, "", "", "")
-call s:hi("asciidocHLabel", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("asciidocListingBlock", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("asciidocMacroAttributes", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("asciidocOneLineTitle", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("asciidocPassthroughBlock", s:nord9_gui, "", s:nord9_term, "", "", "")
-call s:hi("asciidocQuotedMonospaced", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("asciidocTriplePlusPassthrough", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("asciidocAttributeEntry", s:nord10_gui, "", s:nord10_term)
+call s:hi("asciidocAttributeList", s:nord10_gui, "", s:nord10_term)
+call s:hi("asciidocAttributeRef", s:nord10_gui, "", s:nord10_term)
+call s:hi("asciidocHLabel", s:nord9_gui, "", s:nord9_term)
+call s:hi("asciidocListingBlock", s:nord7_gui, "", s:nord7_term)
+call s:hi("asciidocMacroAttributes", s:nord8_gui, "", s:nord8_term)
+call s:hi("asciidocOneLineTitle", s:nord8_gui, "", s:nord8_term)
+call s:hi("asciidocPassthroughBlock", s:nord9_gui, "", s:nord9_term)
+call s:hi("asciidocQuotedMonospaced", s:nord7_gui, "", s:nord7_term)
+call s:hi("asciidocTriplePlusPassthrough", s:nord7_gui, "", s:nord7_term)
 hi! link asciidocAdmonition Keyword
 hi! link asciidocAttributeRef markdownH1
 hi! link asciidocBackslash Keyword
@@ -317,8 +317,8 @@ hi! link asciidocQuotedUnconstrainedBold asciidocQuotedBold
 hi! link asciidocQuotedUnconstrainedEmphasized asciidocQuotedEmphasized
 hi! link asciidocURL markdownLinkText
 
-call s:hi("awkCharClass", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("awkPatterns", s:nord9_gui, "", s:nord9_term, "", s:bold, "")
+call s:hi("awkCharClass", s:nord7_gui, "", s:nord7_term)
+call s:hi("awkPatterns", s:nord9_gui, "", s:nord9_term, "", s:bold)
 hi! link awkArrayElement Identifier
 hi! link awkBoolLogic Keyword
 hi! link awkBrktRegExp SpecialChar
@@ -334,21 +334,21 @@ hi! link awkSpecialCharacter SpecialChar
 hi! link awkSpecialPrintf SpecialChar
 hi! link awkVariables Identifier
 
-call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term)
 hi! link cOperator Operator
 hi! link cPreCondit PreCondit
 hi! link cConstant Type
 
-call s:hi("cmakeGeneratorExpression", s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("cmakeGeneratorExpression", s:nord10_gui, "", s:nord10_term)
 
 hi! link csPreCondit PreCondit
 hi! link csType Type
 hi! link csXmlTag SpecialComment
 
-call s:hi("cssAttributeSelector", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("cssDefinition", s:nord7_gui, "", s:nord7_term, "", "NONE", "")
-call s:hi("cssIdentifier", s:nord7_gui, "", s:nord7_term, "", s:underline, "")
-call s:hi("cssStringQ", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("cssAttributeSelector", s:nord7_gui, "", s:nord7_term)
+call s:hi("cssDefinition", s:nord7_gui, "", s:nord7_term, "", "NONE")
+call s:hi("cssIdentifier", s:nord7_gui, "", s:nord7_term, "", s:underline)
+call s:hi("cssStringQ", s:nord7_gui, "", s:nord7_term)
 hi! link cssAttr Keyword
 hi! link cssBraces Delimiter
 hi! link cssClassName cssDefinition
@@ -358,43 +358,43 @@ hi! link cssPseudoClass cssDefinition
 hi! link cssPseudoClassId cssPseudoClass
 hi! link cssVendor Keyword
 
-call s:hi("dosiniHeader", s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("dosiniHeader", s:nord8_gui, "", s:nord8_term)
 hi! link dosiniLabel Type
 
-call s:hi("dtBooleanKey", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("dtExecKey", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("dtLocaleKey", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("dtNumericKey", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("dtTypeKey", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("dtBooleanKey", s:nord7_gui, "", s:nord7_term)
+call s:hi("dtExecKey", s:nord7_gui, "", s:nord7_term)
+call s:hi("dtLocaleKey", s:nord7_gui, "", s:nord7_term)
+call s:hi("dtNumericKey", s:nord7_gui, "", s:nord7_term)
+call s:hi("dtTypeKey", s:nord7_gui, "", s:nord7_term)
 hi! link dtDelim Delimiter
 hi! link dtLocaleValue Keyword
 hi! link dtTypeValue Keyword
 
 if g:nord_uniform_diff_background == 0
-  call s:hi("DiffAdd", s:nord14_gui, s:nord0_gui, s:nord14_term, "NONE", "inverse", "")
-  call s:hi("DiffChange", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse", "")
-  call s:hi("DiffDelete", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "inverse", "")
-  call s:hi("DiffText", s:nord9_gui, s:nord0_gui, s:nord9_term, "NONE", "inverse", "")
+  call s:hi("DiffAdd", s:nord14_gui, s:nord0_gui, s:nord14_term, "NONE", "inverse")
+  call s:hi("DiffChange", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse")
+  call s:hi("DiffDelete", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "inverse")
+  call s:hi("DiffText", s:nord9_gui, s:nord0_gui, s:nord9_term, "NONE", "inverse")
 else
-  call s:hi("DiffAdd", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "")
-  call s:hi("DiffChange", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "")
-  call s:hi("DiffDelete", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term, "", "")
-  call s:hi("DiffText", s:nord9_gui, s:nord1_gui, s:nord9_term, s:nord1_term, "", "")
+  call s:hi("DiffAdd", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term)
+  call s:hi("DiffChange", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term)
+  call s:hi("DiffDelete", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term)
+  call s:hi("DiffText", s:nord9_gui, s:nord1_gui, s:nord9_term, s:nord1_term)
 endif
 " Legacy groups for official git.vim and diff.vim syntax
 hi! link diffAdded DiffAdd
 hi! link diffChanged DiffChange
 hi! link diffRemoved DiffDelete
 
-call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term)
 
-call s:hi("goBuiltins", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("goBuiltins", s:nord7_gui, "", s:nord7_term)
 hi! link goConstants Keyword
 
-call s:hi("helpBar", s:nord3_gui, "", s:nord3_term, "", "", "")
-call s:hi("helpHyperTextJump", s:nord8_gui, "", s:nord8_term, "", s:underline, "")
+call s:hi("helpBar", s:nord3_gui, "", s:nord3_term)
+call s:hi("helpHyperTextJump", s:nord8_gui, "", s:nord8_term, "", s:underline)
 
-call s:hi("htmlArg", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("htmlArg", s:nord7_gui, "", s:nord7_term)
 call s:hi("htmlLink", s:nord4_gui, "", "", "", "NONE", "NONE")
 hi! link htmlBold Bold
 hi! link htmlEndTag htmlTag
@@ -409,15 +409,15 @@ hi! link htmlSpecialChar SpecialChar
 hi! link htmlTag Keyword
 hi! link htmlTagN htmlTag
 
-call s:hi("javaDocTags", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("javaDocTags", s:nord7_gui, "", s:nord7_term)
 hi! link javaCommentTitle Comment
 hi! link javaScriptBraces Delimiter
 hi! link javaScriptIdentifier Keyword
 hi! link javaScriptNumber Number
 
-call s:hi("jsonKeyword", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("jsonKeyword", s:nord7_gui, "", s:nord7_term)
 
-call s:hi("lessClass", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("lessClass", s:nord7_gui, "", s:nord7_term)
 hi! link lessAmpersand Keyword
 hi! link lessCssAttribute Delimiter
 hi! link lessFunction Function
@@ -431,15 +431,15 @@ hi! link lispFunc Function
 
 hi! link luaFunc Function
 
-call s:hi("markdownBlockquote", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("markdownCode", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("markdownCodeDelimiter", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("markdownFootnote", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("markdownId", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("markdownIdDeclaration", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("markdownH1", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("markdownLinkText", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("markdownUrl", s:nord4_gui, "", "NONE", "", "NONE", "")
+call s:hi("markdownBlockquote", s:nord7_gui, "", s:nord7_term)
+call s:hi("markdownCode", s:nord7_gui, "", s:nord7_term)
+call s:hi("markdownCodeDelimiter", s:nord7_gui, "", s:nord7_term)
+call s:hi("markdownFootnote", s:nord7_gui, "", s:nord7_term)
+call s:hi("markdownId", s:nord7_gui, "", s:nord7_term)
+call s:hi("markdownIdDeclaration", s:nord7_gui, "", s:nord7_term)
+call s:hi("markdownH1", s:nord8_gui, "", s:nord8_term)
+call s:hi("markdownLinkText", s:nord8_gui, "", s:nord8_term)
+call s:hi("markdownUrl", s:nord4_gui, "", "NONE", "", "NONE")
 hi! link markdownBold Bold
 hi! link markdownBoldDelimiter Keyword
 hi! link markdownFootnoteDefinition markdownFootnote
@@ -457,22 +457,22 @@ hi! link markdownListMarker Keyword
 hi! link markdownRule Keyword
 hi! link markdownHeadingDelimiter Keyword
 
-call s:hi("perlPackageDecl", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("perlPackageDecl", s:nord7_gui, "", s:nord7_term)
 
-call s:hi("phpClasses", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("phpDocTags", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("phpClasses", s:nord7_gui, "", s:nord7_term)
+call s:hi("phpDocTags", s:nord7_gui, "", s:nord7_term)
 hi! link phpDocCustomTags phpDocTags
 hi! link phpMemberSelector Keyword
 
-call s:hi("podCmdText", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("podVerbatimLine", s:nord4_gui, "", "NONE", "", "", "")
+call s:hi("podCmdText", s:nord7_gui, "", s:nord7_term)
+call s:hi("podVerbatimLine", s:nord4_gui, "", "NONE")
 hi! link podFormat Keyword
 
 hi! link pythonBuiltin Type
 hi! link pythonEscape SpecialChar
 
-call s:hi("rubyConstant", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("rubySymbol", s:nord6_gui, "", s:nord6_term, "", s:bold, "")
+call s:hi("rubyConstant", s:nord7_gui, "", s:nord7_term)
+call s:hi("rubySymbol", s:nord6_gui, "", s:nord6_term, "", s:bold)
 hi! link rubyAttribute Identifier
 hi! link rubyBlockParameterList Operator
 hi! link rubyInterpolationDelimiter Keyword
@@ -481,20 +481,20 @@ hi! link rubyLocalVariableOrMethod Function
 hi! link rubyPseudoVariable Keyword
 hi! link rubyRegexp SpecialChar
 
-call s:hi("rustAttribute", s:nord10_gui, "", s:nord10_term, "", "", "")
-call s:hi("rustEnum", s:nord7_gui, "", s:nord7_term, "", s:bold, "")
-call s:hi("rustMacro", s:nord8_gui, "", s:nord8_term, "", s:bold, "")
-call s:hi("rustModPath", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("rustPanic", s:nord9_gui, "", s:nord9_term, "", s:bold, "")
-call s:hi("rustTrait", s:nord7_gui, "", s:nord7_term, "", s:italic, "")
+call s:hi("rustAttribute", s:nord10_gui, "", s:nord10_term)
+call s:hi("rustEnum", s:nord7_gui, "", s:nord7_term, "", s:bold)
+call s:hi("rustMacro", s:nord8_gui, "", s:nord8_term, "", s:bold)
+call s:hi("rustModPath", s:nord7_gui, "", s:nord7_term)
+call s:hi("rustPanic", s:nord9_gui, "", s:nord9_term, "", s:bold)
+call s:hi("rustTrait", s:nord7_gui, "", s:nord7_term, "", s:italic)
 hi! link rustCommentLineDoc Comment
 hi! link rustDerive rustAttribute
 hi! link rustEnumVariant rustEnum
 hi! link rustEscape SpecialChar
 hi! link rustQuestionMark Keyword
 
-call s:hi("sassClass", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("sassId", s:nord7_gui, "", s:nord7_term, "", s:underline, "")
+call s:hi("sassClass", s:nord7_gui, "", s:nord7_term)
+call s:hi("sassId", s:nord7_gui, "", s:nord7_term, "", s:underline)
 hi! link sassAmpersand Keyword
 hi! link sassClassChar Delimiter
 hi! link sassControl Keyword
@@ -517,16 +517,16 @@ hi! link shDerefVar Identifier
 hi! link sqlKeyword Keyword
 hi! link sqlSpecial Keyword
 
-call s:hi("vimAugroup", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("vimMapRhs", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("vimNotation", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("vimAugroup", s:nord7_gui, "", s:nord7_term)
+call s:hi("vimMapRhs", s:nord7_gui, "", s:nord7_term)
+call s:hi("vimNotation", s:nord7_gui, "", s:nord7_term)
 hi! link vimFunc Function
 hi! link vimFunction Function
 hi! link vimUserFunc Function
 
-call s:hi("xmlAttrib", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("xmlCdataStart", s:nord3_gui_bright, "", s:nord3_term, "", s:bold, "")
-call s:hi("xmlNamespace", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("xmlAttrib", s:nord7_gui, "", s:nord7_term)
+call s:hi("xmlCdataStart", s:nord3_gui_bright, "", s:nord3_term, "", s:bold)
+call s:hi("xmlNamespace", s:nord7_gui, "", s:nord7_term)
 hi! link xmlAttribPunct Delimiter
 hi! link xmlCdata Comment
 hi! link xmlCdataCdata xmlCdataStart
@@ -535,7 +535,7 @@ hi! link xmlEndTag xmlTagName
 hi! link xmlProcessingDelim Keyword
 hi! link xmlTagName Keyword
 
-call s:hi("yamlBlockMappingKey", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("yamlBlockMappingKey", s:nord7_gui, "", s:nord7_term)
 hi! link yamlBool Keyword
 hi! link yamlDocumentStart Keyword
 
@@ -545,63 +545,63 @@ hi! link yamlDocumentStart Keyword
 "+--- UI ---+
 " ALE
 " > w0rp/ale
-call s:hi("ALEWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("ALEErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "")
-call s:hi("ALEWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "")
-call s:hi("ALEError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "")
+call s:hi("ALEWarningSign", s:nord13_gui, "", s:nord13_term)
+call s:hi("ALEErrorSign" , s:nord11_gui, "", s:nord11_term)
+call s:hi("ALEWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl")
+call s:hi("ALEError" , s:nord11_gui, "", s:nord11_term, "", "undercurl")
 
 " Coc
 " > neoclide/coc.vim
-call s:hi("CocWarningHighlight" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "")
-call s:hi("CocErrorHighlight" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "")
-call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term, "", "", "")
-call s:hi("CocInfoSign" , s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("CocHintSign" , s:nord10_gui, "", s:nord10_term, "", "", "")
+call s:hi("CocWarningHighlight" , s:nord13_gui, "", s:nord13_term, "", "undercurl")
+call s:hi("CocErrorHighlight" , s:nord11_gui, "", s:nord11_term, "", "undercurl")
+call s:hi("CocWarningSign", s:nord13_gui, "", s:nord13_term)
+call s:hi("CocErrorSign" , s:nord11_gui, "", s:nord11_term)
+call s:hi("CocInfoSign" , s:nord8_gui, "", s:nord8_term)
+call s:hi("CocHintSign" , s:nord10_gui, "", s:nord10_term)
 
 if has('nvim')
   " Neovim LSP
   " > neovim/nvim-lspconfig
-  call s:hi("LspCodeLens", s:nord3_gui_bright, "", s:nord3_term, "", "", "")
+  call s:hi("LspCodeLens", s:nord3_gui_bright, "", s:nord3_term)
   if has("nvim-0.5")
-    call s:hi("LspDiagnosticsDefaultWarning", s:nord13_gui, "", s:nord13_term, "", "", "")
-    call s:hi("LspDiagnosticsDefaultError" , s:nord11_gui, "", s:nord11_term, "", "", "")
-    call s:hi("LspDiagnosticsDefaultInformation" , s:nord8_gui, "", s:nord8_term, "", "", "")
-    call s:hi("LspDiagnosticsDefaultHint" , s:nord10_gui, "", s:nord10_term, "", "", "")
-    call s:hi("LspDiagnosticsUnderlineWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl", "")
-    call s:hi("LspDiagnosticsUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl", "")
-    call s:hi("LspDiagnosticsUnderlineInformation" , s:nord8_gui, "", s:nord8_term, "", "undercurl", "")
-    call s:hi("LspDiagnosticsUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl", "")
+    call s:hi("LspDiagnosticsDefaultWarning", s:nord13_gui, "", s:nord13_term)
+    call s:hi("LspDiagnosticsDefaultError" , s:nord11_gui, "", s:nord11_term)
+    call s:hi("LspDiagnosticsDefaultInformation" , s:nord8_gui, "", s:nord8_term)
+    call s:hi("LspDiagnosticsDefaultHint" , s:nord10_gui, "", s:nord10_term)
+    call s:hi("LspDiagnosticsUnderlineWarning" , s:nord13_gui, "", s:nord13_term, "", "undercurl")
+    call s:hi("LspDiagnosticsUnderlineError" , s:nord11_gui, "", s:nord11_term, "", "undercurl")
+    call s:hi("LspDiagnosticsUnderlineInformation" , s:nord8_gui, "", s:nord8_term, "", "undercurl")
+    call s:hi("LspDiagnosticsUnderlineHint" , s:nord10_gui, "", s:nord10_term, "", "undercurl")
   endif
 endif
 
 " GitGutter
 " > airblade/vim-gitgutter
-call s:hi("GitGutterAdd", s:nord14_gui, "", s:nord14_term, "", "", "")
-call s:hi("GitGutterChange", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("GitGutterChangeDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
-call s:hi("GitGutterDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
+call s:hi("GitGutterAdd", s:nord14_gui, "", s:nord14_term)
+call s:hi("GitGutterChange", s:nord13_gui, "", s:nord13_term)
+call s:hi("GitGutterChangeDelete", s:nord11_gui, "", s:nord11_term)
+call s:hi("GitGutterDelete", s:nord11_gui, "", s:nord11_term)
 
 " Signify
 " > mhinz/vim-signify
-call s:hi("SignifySignAdd", s:nord14_gui, "", s:nord14_term, "", "", "")
-call s:hi("SignifySignChange", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("SignifySignChangeDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
-call s:hi("SignifySignDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
+call s:hi("SignifySignAdd", s:nord14_gui, "", s:nord14_term)
+call s:hi("SignifySignChange", s:nord13_gui, "", s:nord13_term)
+call s:hi("SignifySignChangeDelete", s:nord11_gui, "", s:nord11_term)
+call s:hi("SignifySignDelete", s:nord11_gui, "", s:nord11_term)
 
 " fugitive.vim
 " > tpope/vim-fugitive
-call s:hi("gitcommitDiscardedFile", s:nord11_gui, "", s:nord11_term, "", "", "")
-call s:hi("gitcommitUntrackedFile", s:nord11_gui, "", s:nord11_term, "", "", "")
-call s:hi("gitcommitSelectedFile", s:nord14_gui, "", s:nord14_term, "", "", "")
+call s:hi("gitcommitDiscardedFile", s:nord11_gui, "", s:nord11_term)
+call s:hi("gitcommitUntrackedFile", s:nord11_gui, "", s:nord11_term)
+call s:hi("gitcommitSelectedFile", s:nord14_gui, "", s:nord14_term)
 
 " davidhalter/jedi-vim
-call s:hi("jediFunction", s:nord4_gui, s:nord3_gui, "", s:nord3_term, "", "")
-call s:hi("jediFat", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, s:underline.s:bold, "")
+call s:hi("jediFunction", s:nord4_gui, s:nord3_gui, "", s:nord3_term)
+call s:hi("jediFat", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, s:underline.s:bold)
 
 " NERDTree
 " > scrooloose/nerdtree
-call s:hi("NERDTreeExecFile", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("NERDTreeExecFile", s:nord7_gui, "", s:nord7_term)
 hi! link NERDTreeDirSlash Keyword
 hi! link NERDTreeHelp Comment
 
@@ -612,13 +612,13 @@ hi! link CtrlPBufferHid Normal
 
 " vim-clap
 " > liuchengxu/vim-clap
-call s:hi("ClapDir", s:nord4_gui, "", "", "", "", "")
-call s:hi("ClapDisplay", s:nord4_gui, s:nord1_gui, "", s:nord1_term, "", "")
-call s:hi("ClapFile", s:nord4_gui, "", "", "NONE", "", "")
-call s:hi("ClapMatches", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("ClapNoMatchesFound", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("ClapSelected", s:nord7_gui, "", s:nord7_term, "", s:bold, "")
-call s:hi("ClapSelectedSign", s:nord9_gui, "", s:nord9_term, "", "", "")
+call s:hi("ClapDir", s:nord4_gui)
+call s:hi("ClapDisplay", s:nord4_gui, s:nord1_gui, "", s:nord1_term)
+call s:hi("ClapFile", s:nord4_gui, "", "", "NONE")
+call s:hi("ClapMatches", s:nord8_gui, "", s:nord8_term)
+call s:hi("ClapNoMatchesFound", s:nord13_gui, "", s:nord13_term)
+call s:hi("ClapSelected", s:nord7_gui, "", s:nord7_term, "", s:bold)
+call s:hi("ClapSelectedSign", s:nord9_gui, "", s:nord9_term)
 let s:clap_matches = [
         \ [s:nord8_gui,  s:nord8_term] ,
         \ [s:nord9_gui,  s:nord9_term] ,
@@ -626,8 +626,8 @@ let s:clap_matches = [
         \ ]
 for s:nord_clap_match_i in range(1,12)
   let clap_match_color = s:clap_matches[s:nord_clap_match_i % len(s:clap_matches) - 1]
-  call s:hi("ClapMatches" . s:nord_clap_match_i, clap_match_color[0], "", clap_match_color[1], "", "", "")
-  call s:hi("ClapFuzzyMatches" . s:nord_clap_match_i, clap_match_color[0], "", clap_match_color[1], "", "", "")
+  call s:hi("ClapMatches" . s:nord_clap_match_i, clap_match_color[0], "", clap_match_color[1])
+  call s:hi("ClapFuzzyMatches" . s:nord_clap_match_i, clap_match_color[0], "", clap_match_color[1])
 endfor
 unlet s:nord_clap_match_i
 hi! link ClapCurrentSelection PmenuSel
@@ -640,24 +640,24 @@ hi! link ClapProviderId Type
 
 " vim-indent-guides
 " > nathanaelkane/vim-indent-guides
-call s:hi("IndentGuidesEven", "", s:nord1_gui, "", s:nord1_term, "", "")
-call s:hi("IndentGuidesOdd", "", s:nord2_gui, "", s:nord3_term, "", "")
+call s:hi("IndentGuidesEven", "", s:nord1_gui, "", s:nord1_term)
+call s:hi("IndentGuidesOdd", "", s:nord2_gui, "", s:nord3_term)
 
 " vim-plug
 " > junegunn/vim-plug
-call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "")
+call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term)
 
 " vim-signature
 " > kshenoy/vim-signature
-call s:hi("SignatureMarkText", s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("SignatureMarkText", s:nord8_gui, "", s:nord8_term)
 
 " vim-startify
 " > mhinz/vim-startify
-call s:hi("StartifyFile", s:nord6_gui, "", s:nord6_term, "", "", "")
-call s:hi("StartifyFooter", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("StartifyHeader", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("StartifyNumber", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("StartifyPath", s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("StartifyFile", s:nord6_gui, "", s:nord6_term)
+call s:hi("StartifyFooter", s:nord7_gui, "", s:nord7_term)
+call s:hi("StartifyHeader", s:nord8_gui, "", s:nord8_term)
+call s:hi("StartifyNumber", s:nord7_gui, "", s:nord7_term)
+call s:hi("StartifyPath", s:nord8_gui, "", s:nord8_term)
 hi! link StartifyBracket Delimiter
 hi! link StartifySlash Normal
 hi! link StartifySpecial Comment
@@ -665,13 +665,13 @@ hi! link StartifySpecial Comment
 "+--- Languages ---+
 " Haskell
 " > neovimhaskell/haskell-vim
-call s:hi("haskellPreProc", s:nord10_gui, "", s:nord10_term, "", "", "")
-call s:hi("haskellType", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("haskellPreProc", s:nord10_gui, "", s:nord10_term)
+call s:hi("haskellType", s:nord7_gui, "", s:nord7_term)
 hi! link haskellPragma haskellPreProc
 
 " JavaScript
 " > pangloss/vim-javascript
-call s:hi("jsGlobalNodeObjects", s:nord8_gui, "", s:nord8_term, "", s:italic, "")
+call s:hi("jsGlobalNodeObjects", s:nord8_gui, "", s:nord8_term, "", s:italic)
 hi! link jsBrackets Delimiter
 hi! link jsFuncCall Function
 hi! link jsFuncParens Delimiter
@@ -682,8 +682,8 @@ hi! link jsRegexpString SpecialChar
 
 " Pandoc
 " > vim-pandoc/vim-pandoc-syntax
-call s:hi("pandocDefinitionBlockTerm", s:nord7_gui, "", s:nord7_term, "", s:italic, "")
-call s:hi("pandocTableDelims", s:nord3_gui, "", s:nord3_term, "", "", "")
+call s:hi("pandocDefinitionBlockTerm", s:nord7_gui, "", s:nord7_term, "", s:italic)
+call s:hi("pandocTableDelims", s:nord3_gui, "", s:nord3_term)
 hi! link pandocAtxHeader markdownH1
 hi! link pandocBlockQuote markdownBlockquote
 hi! link pandocCiteAnchor Operator
@@ -725,13 +725,13 @@ endif
 
 " TypeScript
 " > HerringtonDarkholme/yats.vim
-call s:hi("typescriptBOMWindowMethod", s:nord8_gui, "", s:nord8_term, "", s:italic, "")
-call s:hi("typescriptClassName", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("typescriptDecorator", s:nord12_gui, "", s:nord12_term, "", "", "")
-call s:hi("typescriptInterfaceName", s:nord7_gui, "", s:nord7_term, "", s:bold, "")
-call s:hi("typescriptRegexpString", s:nord13_gui, "", s:nord13_term, "", "", "")
+call s:hi("typescriptBOMWindowMethod", s:nord8_gui, "", s:nord8_term, "", s:italic)
+call s:hi("typescriptClassName", s:nord7_gui, "", s:nord7_term)
+call s:hi("typescriptDecorator", s:nord12_gui, "", s:nord12_term)
+call s:hi("typescriptInterfaceName", s:nord7_gui, "", s:nord7_term, "", s:bold)
+call s:hi("typescriptRegexpString", s:nord13_gui, "", s:nord13_term)
 " TypeScript JSX
- call s:hi("tsxAttrib", s:nord7_gui, "", s:nord7_term, "", "", "")
+ call s:hi("tsxAttrib", s:nord7_gui, "", s:nord7_term)
 hi! link typescriptOperator Operator
 hi! link typescriptBinaryOp Operator
 hi! link typescriptAssign Operator
@@ -766,10 +766,10 @@ hi! link tsxTagName tsxIntrinsicTagName
 
 " Markdown
 " > plasticboy/vim-markdown
-call s:hi("mkdCode", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("mkdFootnote", s:nord8_gui, "", s:nord8_term, "", "", "")
-call s:hi("mkdRule", s:nord10_gui, "", s:nord10_term, "", "", "")
-call s:hi("mkdLineBreak", s:nord9_gui, "", s:nord9_term, "", "", "")
+call s:hi("mkdCode", s:nord7_gui, "", s:nord7_term)
+call s:hi("mkdFootnote", s:nord8_gui, "", s:nord8_term)
+call s:hi("mkdRule", s:nord10_gui, "", s:nord10_term)
+call s:hi("mkdLineBreak", s:nord9_gui, "", s:nord9_term)
 hi! link mkdBold Bold
 hi! link mkdItalic Italic
 hi! link mkdString Keyword
@@ -790,8 +790,8 @@ hi! link mkdDelimiter Keyword
 
 " PHP
 " > StanAngeloff/php.vim
-call s:hi("phpClass", s:nord7_gui, "", s:nord7_term, "", "", "")
-call s:hi("phpClassImplements", s:nord7_gui, "", s:nord7_term, "", s:bold, "")
+call s:hi("phpClass", s:nord7_gui, "", s:nord7_term)
+call s:hi("phpClassImplements", s:nord7_gui, "", s:nord7_term, "", s:bold)
 hi! link phpClassExtends phpClass
 hi! link phpFunction Function
 hi! link phpMethod Function
@@ -801,23 +801,23 @@ hi! link phpUseClass phpClass
 " > vimwiki/vimwiki
 if !exists("g:vimwiki_hl_headers") || g:vimwiki_hl_headers == 0
   for s:i in range(1,6)
-    call s:hi("VimwikiHeader".s:i, s:nord8_gui, "", s:nord8_term, "", s:bold, "")
+    call s:hi("VimwikiHeader".s:i, s:nord8_gui, "", s:nord8_term, "", s:bold)
   endfor
 else
   let s:vimwiki_hcolor_guifg = [s:nord7_gui, s:nord8_gui, s:nord9_gui, s:nord10_gui, s:nord14_gui, s:nord15_gui]
   let s:vimwiki_hcolor_ctermfg = [s:nord7_term, s:nord8_term, s:nord9_term, s:nord10_term, s:nord14_term, s:nord15_term]
   for s:i in range(1,6)
-    call s:hi("VimwikiHeader".s:i, s:vimwiki_hcolor_guifg[s:i-1] , "", s:vimwiki_hcolor_ctermfg[s:i-1], "", s:bold, "")
+    call s:hi("VimwikiHeader".s:i, s:vimwiki_hcolor_guifg[s:i-1] , "", s:vimwiki_hcolor_ctermfg[s:i-1], "", s:bold)
   endfor
 endif
-call s:hi("VimwikiLink", s:nord8_gui, "", s:nord8_term, "", s:underline, "")
+call s:hi("VimwikiLink", s:nord8_gui, "", s:nord8_term, "", s:underline)
 hi! link VimwikiHeaderChar markdownHeadingDelimiter
 hi! link VimwikiHR Keyword
 hi! link VimwikiList markdownListMarker
 
 " YAML
 " > stephpy/vim-yaml
-call s:hi("yamlKey", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("yamlKey", s:nord7_gui, "", s:nord7_term)
 
 "+------------+
 "+ Public API +