Updated templates + new ones