updating the templates with actual tokens so we can replace more easily
reworking the templating to use the token
updating templates with the tokens