Templates: Update (finally) for Evolve OS sanity