Update starter-templates-and-demos