Correct shapes (18/36)

Correct shapes