Correct shapes (13/36)

Correct shapes