Fix template variables by prefixing @

Hi,

I fixed all templates to use the "new" variable style in templates.

Cheers!
Daniel