Continued to clean up and make menus more consistent.  Added additional
theme templates.