Completed Canvas

This completes the content for the 16 template areas