Added ShapesWithBorders pre-pre-pre-pre-Alpha