Upgraded to pip (non-vendor) Playdoh layout