Think I finally fixed the email template issues.