Improve Crystal vertices

Fixes #7