Color switch carries over to new shape