Template changes based on plugin, module and extension updates in prep for EE2