Adding choice of shapes used to fill blocks