[IMP][website_mail] Improved theme templates