Adding color

Regrouping all the shapes.
Adding the square and color's choice.