Change to new highlighter format