This is a first attempt at adding quads to the shapes. It turned out my shapes were turning inside out quite frequently. A new approach was needed.

(sources)