Correct shapes (12/36)

Correct shapes