Correct shapes (19/36)

Correct shapes