Added support for color sets