updated pods and included them in repo for sanity
revert back to separate preview thumbnail images for shapes (it just looks better)
merge from remote branch