3d shapes and border colors

#3149