Back to the _old_ highlighting code scheme