Converted all curves and holes to diamond-profiles.

If the print works out, need to pull this into master.