Now Sort by Shape

Now sort the SAME shapes by their SHAPE.

Circles
Squares