Fix issues with new color classes