Simplify clip-path option
Add more shapes to scatter