Add support for new 0.90 highlighter system