[OPTI] Some optimization in the color set. See #342