Updates to start using handlebar templates