Add Custom Colors support