Shorten call to 'highlight', remove 'final_colour_set'
Add compatibility with 'g:niji_use_legacy_colours' on 'master'