ShapedTile fully refactored