Updated custom templates with 4.3 upgrade