Added Shapes and Color swatches