updated tokens template and handlebar functions