Revert "3d shapes and border colors"

This reverts commit 6f5db3cf5ef07d16a7f489870ae5b79f97bff6f3.