cleaned up templates.  broke themes