Correct shapes (30/36)

Correct shapes