shapes reworked

by Manuel López