Templates: Update to Aurora 21