Templates: Use @var instead of var, additional