451b8111344a

Make the highlighter an API, add status bar fuckery
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Fri, 18 Aug 2017 12:07:45 -0400
parents a6f651fa8606
children 5e4a535e2d23
branches/tags (none)
files colors/goodwolf.vim

Changes

--- a/colors/goodwolf.vim	Wed Jan 11 12:35:09 2017 +0000
+++ b/colors/goodwolf.vim	Fri Aug 18 12:07:45 2017 -0400
@@ -95,7 +95,7 @@
 
 " }}}
 " Highlighting Function {{{
-function! s:HL(group, fg, ...)
+function! GoodWolfHL(group, fg, ...)
     " Arguments: group, guifg, guibg, gui, guisp
 
     let histring = 'hi ' . a:group . ' '
@@ -129,6 +129,7 @@
 
     execute histring
 endfunction
+
 " }}}
 " Configuration Options {{{
 
@@ -161,136 +162,144 @@
 
 " General/UI {{{
 
-call s:HL('Normal', 'plain', 'blackgravel')
+" call GoodWolfHL('Normal', 'plain', 'blackgravel')
+call GoodWolfHL('Normal', 'plain', 'blackestgravel')
 
-call s:HL('Folded', 'mediumgravel', 'bg', 'none')
+call GoodWolfHL('Folded', 'mediumgravel', 'bg', 'none')
 
-call s:HL('VertSplit', 'lightgravel', 'bg', 'none')
+call GoodWolfHL('VertSplit', 'lightgravel', 'bg', 'none')
 
-call s:HL('CursorLine',   '', 'darkgravel', 'none')
-call s:HL('CursorColumn', '', 'darkgravel')
-call s:HL('ColorColumn',  '', 'darkgravel')
+call GoodWolfHL('CursorLine',   '', 'darkgravel', 'none')
+call GoodWolfHL('CursorColumn', '', 'darkgravel')
+call GoodWolfHL('ColorColumn',  '', 'darkgravel')
 
-call s:HL('TabLine', 'plain', s:tabline, 'none')
-call s:HL('TabLineFill', 'plain', s:tabline, 'none')
-call s:HL('TabLineSel', 'coal', 'tardis', 'none')
+call GoodWolfHL('TabLine', 'plain', s:tabline, 'none')
+call GoodWolfHL('TabLineFill', 'plain', s:tabline, 'none')
+call GoodWolfHL('TabLineSel', 'coal', 'tardis', 'none')
 
-call s:HL('MatchParen', 'dalespale', 'darkgravel', 'bold')
+call GoodWolfHL('MatchParen', 'dalespale', 'darkgravel', 'bold')
 
-call s:HL('NonText',    'deepgravel', 'bg')
-call s:HL('SpecialKey', 'deepgravel', 'bg')
+call GoodWolfHL('NonText',    'deepgravel', 'bg')
+call GoodWolfHL('SpecialKey', 'deepgravel', 'bg')
 
-call s:HL('Visual',    '',  'deepgravel')
-call s:HL('VisualNOS', '',  'deepgravel')
+call GoodWolfHL('Visual',    '',  'deepgravel')
+call GoodWolfHL('VisualNOS', '',  'deepgravel')
 
-call s:HL('Search',    'coal', 'dalespale', 'bold')
-call s:HL('IncSearch', 'coal', 'tardis',    'bold')
+call GoodWolfHL('Search',    'coal', 'dalespale', 'bold')
+call GoodWolfHL('IncSearch', 'coal', 'tardis',    'bold')
 
-call s:HL('Underlined', 'fg', '', 'underline')
+call GoodWolfHL('Underlined', 'fg', '', 'underline')
 
-call s:HL('StatusLine',   'coal', 'tardis',     'bold')
-call s:HL('StatusLineNC', 'snow', 'deepgravel', 'bold')
+call GoodWolfHL('StatusLine',   'coal', 'tardis',     'bold')
+call GoodWolfHL('StatusLineNC', 'snow', 'deepgravel', 'none')
 
-call s:HL('Directory', 'dirtyblonde', '', 'bold')
+call GoodWolfHL('Directory', 'dirtyblonde', '', 'bold')
 
-call s:HL('Title', 'lime')
+call GoodWolfHL('Title', 'lime')
 
-call s:HL('ErrorMsg',   'taffy',       'bg', 'bold')
-call s:HL('MoreMsg',    'dalespale',   '',   'bold')
-call s:HL('ModeMsg',    'dirtyblonde', '',   'bold')
-call s:HL('Question',   'dirtyblonde', '',   'bold')
-call s:HL('WarningMsg', 'dress',       '',   'bold')
+call GoodWolfHL('ErrorMsg',   'taffy',       'bg', 'bold')
+call GoodWolfHL('MoreMsg',    'dalespale',   '',   'bold')
+call GoodWolfHL('ModeMsg',    'dirtyblonde', '',   'bold')
+call GoodWolfHL('Question',   'dirtyblonde', '',   'bold')
+call GoodWolfHL('WarningMsg', 'dress',       '',   'bold')
 
 " This is a ctags tag, not an HTML one.  'Something you can use c-] on'.
-call s:HL('Tag', '', '', 'bold')
+call GoodWolfHL('Tag', '', '', 'bold')
 
 " }}}
 " Gutter {{{
 
-call s:HL('LineNr',     'mediumgravel', s:gutter)
-call s:HL('SignColumn', '',             s:gutter)
-call s:HL('FoldColumn', 'mediumgravel', s:gutter)
+call GoodWolfHL('LineNr',     'mediumgravel', s:gutter)
+call GoodWolfHL('SignColumn', '',             s:gutter)
+call GoodWolfHL('FoldColumn', 'mediumgravel', s:gutter)
 
 " }}}
 " Cursor {{{
 
-call s:HL('Cursor',  'coal', 'tardis', 'bold')
-call s:HL('vCursor', 'coal', 'tardis', 'bold')
-call s:HL('iCursor', 'coal', 'tardis', 'none')
+call GoodWolfHL('Cursor',  'coal', 'tardis', 'bold')
+call GoodWolfHL('vCursor', 'coal', 'tardis', 'bold')
+call GoodWolfHL('iCursor', 'coal', 'tardis', 'none')
 
 " }}}
 " Syntax highlighting {{{
 
 " Start with a simple base.
-call s:HL('Special', 'plain')
+call GoodWolfHL('Special', 'plain')
 
 " Comments are slightly brighter than folds, to make 'headers' easier to see.
-call s:HL('Comment',        'gravel', 'bg', 'none')
-call s:HL('Todo',           'snow',   'bg', 'bold')
-call s:HL('SpecialComment', 'snow',   'bg', 'bold')
+call GoodWolfHL('Comment',        'gravel', 'bg', 'none')
+call GoodWolfHL('Todo',           'snow',   'bg', 'bold')
+call GoodWolfHL('SpecialComment', 'snow',   'bg', 'bold')
 
 " Strings are highlighted separately.
-call s:HL('String', 'lightgravel', '', 'bold')
+call GoodWolfHL('String', 'lightgravel', '', 'bold')
 
 " Turn off everything else
-call s:HL('Statement',    'plain', '', 'none')
-call s:HL('Keyword',      'plain', '', 'none')
-call s:HL('Conditional',  'plain', '', 'none')
-call s:HL('Operator',     'plain', '', 'none')
-call s:HL('Label',        'plain', '', 'none')
-call s:HL('Repeat',       'plain', '', 'none')
-call s:HL('Identifier',   'plain', '', 'none')
-call s:HL('Function',     'plain', '', 'none')
-call s:HL('PreProc',      'plain', '', 'none')
-call s:HL('Macro',        'plain', '', 'none')
-call s:HL('Define',       'plain', '', 'none')
-call s:HL('PreCondit',    'plain', '', 'none')
-call s:HL('Constant',     'plain', '', 'none')
-call s:HL('Character',    'plain', '', 'none')
-call s:HL('Boolean',      'plain', '', 'none')
-call s:HL('Number',       'plain', '', 'none')
-call s:HL('Float',        'plain', '', 'none')
-call s:HL('Type',         'plain', '', 'none')
-call s:HL('StorageClass', 'plain', '', 'none')
-call s:HL('Structure',    'plain', '', 'none')
-call s:HL('Typedef',      'plain', '', 'none')
-call s:HL('Exception',    'plain', '', 'none')
+call GoodWolfHL('Statement',    'plain', '', 'none')
+call GoodWolfHL('Keyword',      'plain', '', 'none')
+call GoodWolfHL('Conditional',  'plain', '', 'none')
+call GoodWolfHL('Operator',     'plain', '', 'none')
+call GoodWolfHL('Label',        'plain', '', 'none')
+call GoodWolfHL('Repeat',       'plain', '', 'none')
+call GoodWolfHL('Identifier',   'plain', '', 'none')
+call GoodWolfHL('Function',     'plain', '', 'none')
+call GoodWolfHL('PreProc',      'plain', '', 'none')
+call GoodWolfHL('Macro',        'plain', '', 'none')
+call GoodWolfHL('Define',       'plain', '', 'none')
+call GoodWolfHL('PreCondit',    'plain', '', 'none')
+call GoodWolfHL('Constant',     'plain', '', 'none')
+call GoodWolfHL('Character',    'plain', '', 'none')
+call GoodWolfHL('Boolean',      'plain', '', 'none')
+call GoodWolfHL('Number',       'plain', '', 'none')
+call GoodWolfHL('Float',        'plain', '', 'none')
+call GoodWolfHL('Type',         'plain', '', 'none')
+call GoodWolfHL('StorageClass', 'plain', '', 'none')
+call GoodWolfHL('Structure',    'plain', '', 'none')
+call GoodWolfHL('Typedef',      'plain', '', 'none')
+call GoodWolfHL('Exception',    'plain', '', 'none')
 
 " Not sure what 'special character in a constant' means, but let's make it pop.
-call s:HL('SpecialChar', 'plain', '', 'bold')
+call GoodWolfHL('SpecialChar', 'plain', '', 'bold')
 
 " Misc
-call s:HL('Error',  'snow',   'taffy', 'bold')
-call s:HL('Debug',  'snow',   '',      'bold')
-call s:HL('Ignore', 'gravel', '',      '')
+call GoodWolfHL('Error',  'snow',   'taffy', 'bold')
+call GoodWolfHL('Debug',  'snow',   '',      'bold')
+call GoodWolfHL('Ignore', 'gravel', '',      '')
 
 " }}}
 " Completion Menu {{{
 
-call s:HL('Pmenu', 'plain', 'deepergravel')
-call s:HL('PmenuSel', 'coal', 'tardis', 'bold')
-call s:HL('PmenuSbar', '', 'deepergravel')
-call s:HL('PmenuThumb', 'brightgravel')
+call GoodWolfHL('Pmenu', 'plain', 'deepergravel')
+call GoodWolfHL('PmenuSel', 'coal', 'tardis', 'bold')
+call GoodWolfHL('PmenuSbar', '', 'deepergravel')
+call GoodWolfHL('PmenuThumb', 'brightgravel')
 
 " }}}
 " Diffs {{{
 
-call s:HL('DiffDelete', 'coal', 'coal')
-call s:HL('DiffAdd',    '',     'deepergravel')
-call s:HL('DiffChange', '',     'darkgravel')
-call s:HL('DiffText',   'snow', 'deepergravel', 'bold')
+call GoodWolfHL('DiffDelete', 'coal', 'coal')
+call GoodWolfHL('DiffAdd',    '',     'deepergravel')
+call GoodWolfHL('DiffChange', '',     'darkgravel')
+call GoodWolfHL('DiffText',   'snow', 'deepergravel', 'bold')
 
 " }}}
 " Spelling {{{
 
 if has("spell")
-    call s:HL('SpellCap', 'dalespale', 'bg', 'undercurl,bold', 'dalespale')
-    call s:HL('SpellBad', '', 'bg', 'undercurl', 'dalespale')
-    call s:HL('SpellLocal', '', '', 'undercurl', 'dalespale')
-    call s:HL('SpellRare', '', '', 'undercurl', 'dalespale')
+    call GoodWolfHL('SpellCap', 'dalespale', 'bg', 'undercurl,bold', 'dalespale')
+    call GoodWolfHL('SpellBad', '', 'bg', 'undercurl', 'dalespale')
+    call GoodWolfHL('SpellLocal', '', '', 'undercurl', 'dalespale')
+    call GoodWolfHL('SpellRare', '', '', 'undercurl', 'dalespale')
 endif
 
 " }}}
+" Status Line Utils {{{
+
+call GoodWolfHL('GWStatusLineMode', 'coal', 'lime')
+call GoodWolfHL('GWStatusLineModeX', 'lime', 'deepergravel')
+
+
+" }}}
 
 " }}}
 " Plugins {{{
@@ -298,57 +307,57 @@
 " Clam {{{
 
 " hg status
-call s:HL('clamHgStatusAdded',    'lime', '', 'none')
-call s:HL('clamHgStatusModified', 'saltwatertaffy', '', 'none')
-call s:HL('clamHgStatusRemoved',  'toffee', '', 'none')
-call s:HL('clamHgStatusUnknown',  'taffy', '', 'bold')
+call GoodWolfHL('clamHgStatusAdded',    'lime', '', 'none')
+call GoodWolfHL('clamHgStatusModified', 'saltwatertaffy', '', 'none')
+call GoodWolfHL('clamHgStatusRemoved',  'toffee', '', 'none')
+call GoodWolfHL('clamHgStatusUnknown',  'taffy', '', 'bold')
 
 " }}}
 " CtrlP {{{
 
 " the message when no match is found
-call s:HL('CtrlPNoEntries', 'snow', 'taffy', 'bold')
+call GoodWolfHL('CtrlPNoEntries', 'snow', 'taffy', 'bold')
 
 " the matched pattern
-call s:HL('CtrlPMatch', 'dress', 'bg', 'bold')
+call GoodWolfHL('CtrlPMatch', 'dress', 'bg', 'bold')
 
 " the line prefix '>' in the match window
-call s:HL('CtrlPLinePre', 'deepgravel', 'bg', 'none')
+call GoodWolfHL('CtrlPLinePre', 'deepgravel', 'bg', 'none')
 
 " the prompt’s base
-call s:HL('CtrlPPrtBase', 'deepgravel', 'bg', 'none')
+call GoodWolfHL('CtrlPPrtBase', 'deepgravel', 'bg', 'none')
 
 " the prompt’s text
-call s:HL('CtrlPPrtText', 'plain', 'bg', 'none')
+call GoodWolfHL('CtrlPPrtText', 'plain', 'bg', 'none')
 
 " the prompt’s cursor when moving over the text
-call s:HL('CtrlPPrtCursor', 'coal', 'tardis', 'bold')
+call GoodWolfHL('CtrlPPrtCursor', 'coal', 'tardis', 'bold')
 
 " 'prt' or 'win', also for 'regex'
-call s:HL('CtrlPMode1', 'coal', 'tardis', 'bold')
+call GoodWolfHL('CtrlPMode1', 'coal', 'tardis', 'bold')
 
 " 'file' or 'path', also for the local working dir
-call s:HL('CtrlPMode2', 'coal', 'tardis', 'bold')
+call GoodWolfHL('CtrlPMode2', 'coal', 'tardis', 'bold')
 
 " the scanning status
-call s:HL('CtrlPStats', 'coal', 'tardis', 'bold')
+call GoodWolfHL('CtrlPStats', 'coal', 'tardis', 'bold')
 
 " }}}
 " Interesting Words {{{
 
 " These are only used if you're me or have copied the <leader>hNUM mappings
 " from my Vimrc.
-call s:HL('InterestingWord1', 'coal', 'orange')
-call s:HL('InterestingWord2', 'coal', 'lime')
-call s:HL('InterestingWord3', 'coal', 'saltwatertaffy')
-call s:HL('InterestingWord4', 'coal', 'toffee')
-call s:HL('InterestingWord5', 'coal', 'dress')
-call s:HL('InterestingWord6', 'coal', 'taffy')
+call GoodWolfHL('InterestingWord1', 'coal', 'orange')
+call GoodWolfHL('InterestingWord2', 'coal', 'lime')
+call GoodWolfHL('InterestingWord3', 'coal', 'saltwatertaffy')
+call GoodWolfHL('InterestingWord4', 'coal', 'toffee')
+call GoodWolfHL('InterestingWord5', 'coal', 'dress')
+call GoodWolfHL('InterestingWord6', 'coal', 'taffy')
 
 " }}}
 " Rainbow Parentheses {{{
 
-call s:HL('level1c',  'mediumgravel', '', 'bold')
+call GoodWolfHL('level1c',  'mediumgravel', '', 'bold')
 
 " }}}
 
@@ -357,79 +366,79 @@
 
 " Clojure {{{
 
-call s:HL('clojureParen0', 'lightgravel', '', 'none')
-call s:HL('clojureAnonArg', 'snow', '', 'bold')
+call GoodWolfHL('clojureParen0', 'lightgravel', '', 'none')
+call GoodWolfHL('clojureAnonArg', 'snow', '', 'bold')
 
 " }}}
 " CSS {{{
 
-call s:HL('cssBraces', 'lightgravel', '', 'none')
+call GoodWolfHL('cssBraces', 'lightgravel', '', 'none')
 
 " }}}
 " Diff {{{
 
-call s:HL('gitDiff', 'lightgravel', '',)
+call GoodWolfHL('gitDiff', 'lightgravel', '',)
 
-call s:HL('diffRemoved', 'dress', '',)
-call s:HL('diffAdded', 'lime', '',)
-call s:HL('diffFile', 'coal', 'toffee', 'bold')
-call s:HL('diffNewFile', 'coal', 'toffee', 'bold')
+call GoodWolfHL('diffRemoved', 'dress', '',)
+call GoodWolfHL('diffAdded', 'lime', '',)
+call GoodWolfHL('diffFile', 'coal', 'toffee', 'bold')
+call GoodWolfHL('diffNewFile', 'coal', 'toffee', 'bold')
 
-call s:HL('diffLine', 'coal', 'orange', 'bold')
-call s:HL('diffSubname', 'orange', '', 'none')
+call GoodWolfHL('diffLine', 'coal', 'orange', 'bold')
+call GoodWolfHL('diffSubname', 'orange', '', 'none')
 
 " }}}
 " HTML {{{
 
 " Punctuation
-call s:HL('htmlTag',    'darkroast', 'bg', 'none')
-call s:HL('htmlEndTag', 'darkroast', 'bg', 'none')
+call GoodWolfHL('htmlTag',    'darkroast', 'bg', 'none')
+call GoodWolfHL('htmlEndTag', 'darkroast', 'bg', 'none')
 
 " Tag names
-call s:HL('htmlTagName',        'coffee', '', 'bold')
-call s:HL('htmlSpecialTagName', 'coffee', '', 'bold')
-call s:HL('htmlSpecialChar',    'lime',   '', 'none')
+call GoodWolfHL('htmlTagName',        'coffee', '', 'bold')
+call GoodWolfHL('htmlSpecialTagName', 'coffee', '', 'bold')
+call GoodWolfHL('htmlSpecialChar',    'lime',   '', 'none')
 
 " Attributes
-call s:HL('htmlArg', 'coffee', '', 'none')
+call GoodWolfHL('htmlArg', 'coffee', '', 'none')
 
 " Stuff inside an <a> tag
 
 if g:badwolf_html_link_underline
-    call s:HL('htmlLink', 'lightgravel', '', 'underline')
+    call GoodWolfHL('htmlLink', 'lightgravel', '', 'underline')
 else
-    call s:HL('htmlLink', 'lightgravel', '', 'none')
+    call GoodWolfHL('htmlLink', 'lightgravel', '', 'none')
 endif
 
 " }}}
 " Java {{{
 
-call s:HL('javaCommentTitle', 'gravel', '')
-call s:HL('javaDocTags', 'snow', '', 'none')
-call s:HL('javaDocParam', 'plain', '', '')
+call GoodWolfHL('javaCommentTitle', 'gravel', '')
+call GoodWolfHL('javaDocTags', 'snow', '', 'none')
+call GoodWolfHL('javaDocParam', 'plain', '', '')
 
 " }}}
 " LaTeX {{{
 
-call s:HL('texStatement', 'dress', '', 'none')
-call s:HL('texDocType', 'dress', '', 'none')
-call s:HL('texSection', 'dress', '', 'none')
-call s:HL('texBeginEnd', 'dress', '', 'none')
+call GoodWolfHL('texStatement', 'dress', '', 'none')
+call GoodWolfHL('texDocType', 'dress', '', 'none')
+call GoodWolfHL('texSection', 'dress', '', 'none')
+call GoodWolfHL('texBeginEnd', 'dress', '', 'none')
 
-call s:HL('texMathZoneX', 'orange', '', 'none')
-call s:HL('texMathZoneA', 'orange', '', 'none')
-call s:HL('texMathZoneB', 'orange', '', 'none')
-call s:HL('texMathZoneC', 'orange', '', 'none')
-call s:HL('texMathZoneD', 'orange', '', 'none')
-call s:HL('texMathZoneE', 'orange', '', 'none')
-call s:HL('texMathZoneV', 'orange', '', 'none')
-call s:HL('texMathZoneX', 'orange', '', 'none')
-call s:HL('texMath', 'orange', '', 'none')
-call s:HL('texMathMatcher', 'orange', '', 'none')
-call s:HL('texRefLabel', 'dirtyblonde', '', 'none')
-call s:HL('texRefZone', 'lime', '', 'none')
-call s:HL('texDelimiter', 'orange', '', 'none')
-call s:HL('texZone', 'brightgravel', '', 'none')
+call GoodWolfHL('texMathZoneX', 'orange', '', 'none')
+call GoodWolfHL('texMathZoneA', 'orange', '', 'none')
+call GoodWolfHL('texMathZoneB', 'orange', '', 'none')
+call GoodWolfHL('texMathZoneC', 'orange', '', 'none')
+call GoodWolfHL('texMathZoneD', 'orange', '', 'none')
+call GoodWolfHL('texMathZoneE', 'orange', '', 'none')
+call GoodWolfHL('texMathZoneV', 'orange', '', 'none')
+call GoodWolfHL('texMathZoneX', 'orange', '', 'none')
+call GoodWolfHL('texMath', 'orange', '', 'none')
+call GoodWolfHL('texMathMatcher', 'orange', '', 'none')
+call GoodWolfHL('texRefLabel', 'dirtyblonde', '', 'none')
+call GoodWolfHL('texRefZone', 'lime', '', 'none')
+call GoodWolfHL('texDelimiter', 'orange', '', 'none')
+call GoodWolfHL('texZone', 'brightgravel', '', 'none')
 
 augroup badwolf_tex
     au!
@@ -443,71 +452,72 @@
 " This isn't a specific plugin, but just useful highlight classes for anything
 " that might want to use them.
 
-call s:HL('replPrompt', 'tardis', '', 'bold')
+call GoodWolfHL('replPrompt', 'tardis', '', 'bold')
 
 " }}}
 " Mail {{{
 
-call s:HL('mailSubject', 'orange', '', 'bold')
-call s:HL('mailHeader', 'lightgravel', '', '')
-call s:HL('mailHeaderKey', 'lightgravel', '', '')
-call s:HL('mailHeaderEmail', 'snow', '', '')
-call s:HL('mailURL', 'toffee', '', 'underline')
-call s:HL('mailSignature', 'gravel', '', 'none')
+call GoodWolfHL('mailSubject', 'orange', '', 'bold')
+call GoodWolfHL('mailHeader', 'lightgravel', '', '')
+call GoodWolfHL('mailHeaderKey', 'lightgravel', '', '')
+call GoodWolfHL('mailHeaderEmail', 'snow', '', '')
+call GoodWolfHL('mailURL', 'toffee', '', 'underline')
+call GoodWolfHL('mailSignature', 'gravel', '', 'none')
 
-call s:HL('mailQuoted1', 'gravel', '', 'none')
-call s:HL('mailQuoted2', 'dress', '', 'none')
-call s:HL('mailQuoted3', 'dirtyblonde', '', 'none')
-call s:HL('mailQuoted4', 'orange', '', 'none')
-call s:HL('mailQuoted5', 'lime', '', 'none')
+call GoodWolfHL('mailQuoted1', 'gravel', '', 'none')
+call GoodWolfHL('mailQuoted2', 'dress', '', 'none')
+call GoodWolfHL('mailQuoted3', 'dirtyblonde', '', 'none')
+call GoodWolfHL('mailQuoted4', 'orange', '', 'none')
+call GoodWolfHL('mailQuoted5', 'lime', '', 'none')
 
 " }}}
 " Markdown {{{
 
-call s:HL('markdownHeadingRule', 'lightgravel', '', 'bold')
-call s:HL('markdownHeadingDelimiter', 'lightgravel', '', 'bold')
-call s:HL('markdownOrderedListMarker', 'lightgravel', '', 'bold')
-call s:HL('markdownListMarker', 'lightgravel', '', 'bold')
-call s:HL('markdownItalic', 'snow', '', 'bold')
-call s:HL('markdownBold', 'snow', '', 'bold')
-call s:HL('markdownH1', 'orange', '', 'bold')
-call s:HL('markdownH2', 'lime', '', 'bold')
-call s:HL('markdownH3', 'lime', '', 'none')
-call s:HL('markdownH4', 'lime', '', 'none')
-call s:HL('markdownH5', 'lime', '', 'none')
-call s:HL('markdownH6', 'lime', '', 'none')
-call s:HL('markdownLinkText', 'toffee', '', 'underline')
-call s:HL('markdownIdDeclaration', 'toffee')
-call s:HL('markdownAutomaticLink', 'toffee', '', 'bold')
-call s:HL('markdownUrl', 'toffee', '', 'bold')
-call s:HL('markdownUrldelimiter', 'lightgravel', '', 'bold')
-call s:HL('markdownLinkDelimiter', 'lightgravel', '', 'bold')
-call s:HL('markdownLinkTextDelimiter', 'lightgravel', '', 'bold')
-call s:HL('markdownCodeDelimiter', 'dirtyblonde', '', 'bold')
-call s:HL('markdownCode', 'dirtyblonde', '', 'none')
-call s:HL('markdownCodeBlock', 'dirtyblonde', '', 'none')
+call GoodWolfHL('markdownHeadingRule', 'lightgravel', '', 'bold')
+call GoodWolfHL('markdownHeadingDelimiter', 'lightgravel', '', 'bold')
+call GoodWolfHL('markdownOrderedListMarker', 'lightgravel', '', 'bold')
+call GoodWolfHL('markdownListMarker', 'lightgravel', '', 'bold')
+call GoodWolfHL('markdownItalic', 'snow', '', 'bold')
+call GoodWolfHL('markdownBold', 'snow', '', 'bold')
+call GoodWolfHL('markdownH1', 'orange', '', 'bold')
+call GoodWolfHL('markdownH2', 'lime', '', 'bold')
+call GoodWolfHL('markdownH3', 'lime', '', 'none')
+call GoodWolfHL('markdownH4', 'lime', '', 'none')
+call GoodWolfHL('markdownH5', 'lime', '', 'none')
+call GoodWolfHL('markdownH6', 'lime', '', 'none')
+call GoodWolfHL('markdownLinkText', 'toffee', '', 'underline')
+call GoodWolfHL('markdownIdDeclaration', 'toffee')
+call GoodWolfHL('markdownAutomaticLink', 'toffee', '', 'bold')
+call GoodWolfHL('markdownUrl', 'toffee', '', 'bold')
+call GoodWolfHL('markdownUrldelimiter', 'lightgravel', '', 'bold')
+call GoodWolfHL('markdownLinkDelimiter', 'lightgravel', '', 'bold')
+call GoodWolfHL('markdownLinkTextDelimiter', 'lightgravel', '', 'bold')
+call GoodWolfHL('markdownCodeDelimiter', 'dirtyblonde', '', 'bold')
+call GoodWolfHL('markdownCode', 'dirtyblonde', '', 'none')
+call GoodWolfHL('markdownCodeBlock', 'dirtyblonde', '', 'none')
 
 " }}}
 " Python {{{
 
 hi def link pythonOperator Operator
-call s:HL('pythonBuiltin',     'plain')
-call s:HL('pythonBuiltinObj',  'plain')
-call s:HL('pythonBuiltinFunc', 'plain')
-call s:HL('pythonEscape',      'plain')
-call s:HL('pythonException',   'plain', '', 'none')
-call s:HL('pythonExceptions',  'plain', '', 'none')
-call s:HL('pythonPrecondit',   'plain', '', 'none')
-call s:HL('pythonDecorator',   'plain', '', 'none')
-call s:HL('pythonRun',         'plain', '', 'none')
-call s:HL('pythonCoding',      'plain', '', 'bold')
+call GoodWolfHL('pythonBuiltin',     'plain')
+call GoodWolfHL('pythonBuiltinObj',  'plain')
+call GoodWolfHL('pythonBuiltinFunc', 'plain')
+call GoodWolfHL('pythonEscape',      'plain')
+call GoodWolfHL('pythonException',   'plain', '', 'none')
+call GoodWolfHL('pythonExceptions',  'plain', '', 'none')
+call GoodWolfHL('pythonPrecondit',   'plain', '', 'none')
+call GoodWolfHL('pythonDecorator',   'plain', '', 'none')
+call GoodWolfHL('pythonRun',         'plain', '', 'none')
+call GoodWolfHL('pythonCoding',      'plain', '', 'bold')
 
 " }}}
 " Vim {{{
 
-call s:HL('helpHyperTextJump', 'dress', '', 'none')
+call GoodWolfHL('helpHyperTextJump', 'dress', '', 'none')
 
 " }}}
 
 " }}}
 
+