Do some formatting before we do some schema changes.
Add/thread up data-driven category label colors.
Just tidy up.