Cleanup some color handling with constants