Feature/theme

This is in lieu of my previous pull request for feature/set_templates.  It includes those changes plus additional style fixes and other issues assigned to me.