SWITCHYARD-1561 - Usability updates for colors