Updated expand for reusing generated colors