Add all shapes at open.

Renamed files, indentation fixes...
fixup! Add all shapes at open.