fixed calendar template and newgeometery