tidy up and refactoring of theme setup in preparation for 1.2 release
forgot to add these
edit of small ditails in templates in preparation for 1.2 release