Move some config out, and use the general highlighting code.