Added color grouping feature