Templates Update

Now can generate citations of all types previously listed.