Updated all templates to use new variables scheme