Correct shapes (16/36)

Correct shapes