Updated templates and components for aem6