redesign: shape template, merging all shapes into one