Initial template changes for 5.0