Added an option for an outline colour.

All the shapes can have an outline colour, the drawing is not
implemented yet.
Adding comments and formatting