Improve highlighter to handle +merge, -delete, :label keys and %placeholders%