Improvements for documentation of shapes

I've made a few improvements to the examples showing different shapes. I've submitted this at two separate commits within the same pull request. The first fixes errors in the documentation: there are 26 (0-25) shapes and shapes 19 and 20 do not have a fill.  The second presents a better version of the shape catalog.

The first should be applied as it corrects factual errors; the second is optional, but I think a significant improvement.